CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:

  Additional changes for bug#29903
  - Changed to do embedded build part as normal build, when
    WITH_EMBEDDED_SERVER is set.
  - Allow both normal and debug build with embedded.
  - Build static embedded library by pointing out all source and compile
    it all, i.e. not building libraries from libraries, not portable.
  - Let embedded use generated files from the "sql" directory, added
    dependencies to make sure built before embedded.
  - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
    linked in when debug target is used.
  - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
    others can't depend on it, not defined at configure time. Instead
    set the output file name.
  - Created work around for bug in CMake 2.4.6 and output names, to
    set the "mysqld<suffix>.pdb" name to the same base name.
  - Set the correct manifest "name" (patch by iggy)


CMakeLists.txt:
  Changes for embedded and Windows
libmysql/CMakeLists.txt:
  Changes for embedded and Windows
libmysqld/CMakeLists.txt:
  Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
  Changes for embedded and Windows
mysys/CMakeLists.txt:
  Changes for embedded and Windows
regex/CMakeLists.txt:
  Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
  Changes for embedded and Windows
sql/CMakeLists.txt:
  Changes for embedded and Windows
storage/archive/CMakeLists.txt:
  Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
  Changes for embedded and Windows
storage/csv/CMakeLists.txt:
  Changes for embedded and Windows
storage/example/CMakeLists.txt:
  Changes for embedded and Windows
storage/federated/CMakeLists.txt:
  Changes for embedded and Windows
storage/heap/CMakeLists.txt:
  Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
  Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
  Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
  Changes for embedded and Windows
strings/CMakeLists.txt:
  Changes for embedded and Windows
vio/CMakeLists.txt:
  Changes for embedded and Windows
win/README:
  Changes for embedded and Windows
win/configure.js:
  Changes for embedded and Windows
win/mysql_manifest.cmake:
  Changes for embedded and Windows

1 files changed, 6 insertions, 6 deletions

diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt
index 13956fe0a10..ee129ff2df0 100644
--- a/libmysqld/examples/CMakeLists.txt
+++ b/libmysqld/examples/CMakeLists.txt
@@ -15,24 +15,24 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
-                    ${CMAKE_SOURCE_DIR}/libmysqld/release
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/zlib                   
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 
 # Currently does not work with DBUG, there are missing symbols reported.
-ADD_DEFINITIONS(-DDBUG_OFF)
-ADD_DEFINITIONS(-DUSE_TLS)
+IF(WIN32)
+  ADD_DEFINITIONS(-DUSE_TLS)
+ENDIF(WIN32)
 ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
                ../../client/mysql.cc ../../client/readline.cc
                ../../client/sql_string.cc)
-TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib dbug regex strings wsock32)
+TARGET_LINK_LIBRARIES(mysql_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32)
 ADD_DEPENDENCIES(mysql_embedded libmysqld)
 
 ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.c)
-TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib dbug regex strings wsock32)
+TARGET_LINK_LIBRARIES(mysqltest_embedded mysys yassl taocrypt zlib debug dbug regex strings wsock32)
 ADD_DEPENDENCIES(mysqltest_embedded libmysqld)
 
 ADD_EXECUTABLE(mysql_client_test_embedded ../../tests/mysql_client_test.c)
-TARGET_LINK_LIBRARIES(mysql_client_test_embedded dbug mysys yassl taocrypt zlib strings wsock32)
+TARGET_LINK_LIBRARIES(mysql_client_test_embedded debug dbug mysys yassl taocrypt zlib strings wsock32)
 ADD_DEPENDENCIES(mysql_client_test_embedded libmysqld)