Post Merge Fixup.

CMakeLists.txt

@@ -18,22 +18,24 @@ PROJECT(MySql)
 # This reads user configuration, generated by configure.js.
 INCLUDE(win/configure.data)
 
-# By default, CMake will create Release, Debug, RelWithDebInfo and MinSizeRel
-# configurations. The EMBEDDED_ONLY build parameter is necessary because CMake
-# doesn't support custom build configurations for VS2005.  Since the Debug
-# configuration does not work properly with USE_TLS defined 
-# (see mysys/CMakeLists.txt) the easiest way to debug the Embedded Server is to
-# use the RelWithDebInfo configuration without optimizations.
-#
-# Debug default CXX_FLAGS           "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1"
-# RelWithDebInfo default CXX_FLAGS  "/MD /Zi /O2 /Ob1 /D NDEBUG"
-#
-IF(NOT EMBEDDED_ONLY)
-  # Hardcode support for CSV storage engine
-  SET(WITH_CSV_STORAGE_ENGINE TRUE)
-ELSE(NOT EMBEDDED_ONLY)
+# Hardcode support for CSV storage engine
+SET(WITH_CSV_STORAGE_ENGINE TRUE)
+
+# CMAKE will not allow custom VS7+ configurations.  mysqld and libmysqld
+# cannot be built at the same time as they require different configurations
+IF(EMBEDDED_ONLY)
+  ADD_DEFINITIONS(-DEMBEDDED_LIBRARY)
+  # By default, CMake will create Release, Debug, RelWithDebInfo and MinSizeRel
+  # configurations. The EMBEDDED_ONLY build parameter is necessary because CMake
+  # doesn't support custom build configurations for VS2005.  Since the Debug
+  # configuration does not work properly with USE_TLS defined 
+  # (see mysys/CMakeLists.txt) the easiest way to debug the Embedded Server is to
+  # use the RelWithDebInfo configuration without optimizations.
+  #
+  # Debug default CXX_FLAGS           "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1"
+  # RelWithDebInfo default CXX_FLAGS  "/MD /Zi /O2 /Ob1 /D NDEBUG"
   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /Od /Ob0 /D NDEBUG" CACHE STRING "No Optimization" FORCE)
-ENDIF(NOT EMBEDDED_ONLY)
+ENDIF(EMBEDDED_ONLY)
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
                ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
@@ -246,16 +248,13 @@ ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
-# CMAKE will not allow custom VS7+ configurations.  mysqld and libmysqld
-# cannot be built at the same time as they require different configurations
+ADD_SUBDIRECTORY(libmysql)
 IF(EMBEDDED_ONLY) 
-  ADD_DEFINITIONS(-DEMBEDDED_LIBRARY)
   ADD_SUBDIRECTORY(libmysqld)
   ADD_SUBDIRECTORY(libmysqld/examples)
 ELSE(EMBEDDED_ONLY)
   ADD_SUBDIRECTORY(client)
   ADD_SUBDIRECTORY(sql)
   ADD_SUBDIRECTORY(server-tools/instance-manager)
-  ADD_SUBDIRECTORY(libmysql)
   ADD_SUBDIRECTORY(tests)
 ENDIF(EMBEDDED_ONLY)

libmysql/CMakeLists.txt

@@ -110,24 +110,24 @@ SET(CLIENT_SOURCES   ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
 # beond the documented API, and try access the Thread Local Storage.
 # The "_notls" means no Tls*() functions used, i.e. "static" TLS.
 
-ADD_LIBRARY(libmysql          SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
 ADD_LIBRARY(mysqlclient       STATIC ${CLIENT_SOURCES})
-ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES})
-
-SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")
-
-ADD_DEPENDENCIES(libmysql GenError)
-TARGET_LINK_LIBRARIES(libmysql wsock32)
-
 ADD_DEPENDENCIES(mysqlclient GenError)
 TARGET_LINK_LIBRARIES(mysqlclient)
 
+ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES})
 ADD_DEPENDENCIES(mysqlclient_notls GenError)
 TARGET_LINK_LIBRARIES(mysqlclient_notls)
 
-ADD_EXECUTABLE(myTest mytest.c)
-TARGET_LINK_LIBRARIES(myTest libmysql)
-
-IF(EMBED_MANIFESTS)
-  MYSQL_EMBED_MANIFEST("myTest" "asInvoker")
-ENDIF(EMBED_MANIFESTS)
+IF(NOT EMBEDDED_ONLY)
+  ADD_LIBRARY(libmysql          SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
+  SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")
+  ADD_DEPENDENCIES(libmysql GenError)
+  TARGET_LINK_LIBRARIES(libmysql wsock32)
+  
+  ADD_EXECUTABLE(myTest mytest.c)
+  TARGET_LINK_LIBRARIES(myTest libmysql)
+  
+  IF(EMBED_MANIFESTS)
+    MYSQL_EMBED_MANIFEST("myTest" "asInvoker")
+  ENDIF(EMBED_MANIFESTS)
+ENDIF(NOT EMBEDDED_ONLY)