Fix comments about recommended way to build.

Author: Tor Didriksen

BUILD/README

@@ -24,15 +24,20 @@ Adding -DWITH_DEBUG=1 to the cmake command line gives you a debug build.
 
 Building on Windows is slightly different:
 cd <some build directory>
-cmake <path to source directonry>
+cmake <path to source directory>
 
-devenv MySQL.sln /build Debug
+cmake --build . --config Debug
 or
-devenv MySQL.sln /build RelWithDebInfo
+cmake --build . --config RelWithDebInfo
 
 
 If you have special needs, you can disable the defaults by setting
 these cmake variables off:
 
 WITH_DEFAULT_COMPILER_OPTIONS
 WITH_DEFAULT_FEATURE_SET
+
+Note: For building with unit tests, you need to tell cmake where to find
+the sources, see ../unittest/gunit/CMakeLists.txt
+You should *not* 'make install' googletest/googlemock on your system,
+the libraries must be built from source, with the unit tests.

mysql-test/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ IF(CMAKE_BUILD_TYPE)
   ENDIF()
 ENDIF()
 
-# On windows do: 'devenv mysql.sln /build Debug /project test-mtr'
+# On windows do: 'cmake --build . --config debug --target test-mtr'
 # On unix do: 'make test-mtr'
 ADD_CUSTOM_TARGET(test-mtr
   COMMAND perl ./mysql-test-run.pl --force --parallel=4 --suite=main