diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2007-08-06 23:16:01 +0200 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2007-08-06 23:16:01 +0200 |
| commit | 413d1e1aa4ab8b990c04334c7b3a1fe27cb979ad (patch) | |
| tree | 7b218053b942a53e4c500c94ca3a1c0d7464d859 /libmysql | |
| parent | add9cb76b56475ec893c88c99a28c25b3c0d0c1f (diff) | |
| download | mariadb-git-413d1e1aa4ab8b990c04334c7b3a1fe27cb979ad.tar.gz | |
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)
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 2e6ca55e618..8471bbbd76c 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -38,6 +38,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include # Include and add the directory path SET(SOURCE_SUBLIBS TRUE) +SET(LIB_SOURCES "") INCLUDE(${CMAKE_SOURCE_DIR}/zlib/CMakeLists.txt) FOREACH(rpath ${ZLIB_SOURCES}) @@ -118,16 +119,16 @@ ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES}) ADD_DEPENDENCIES(mysqlclient_notls GenError) TARGET_LINK_LIBRARIES(mysqlclient_notls) -IF(NOT EMBEDDED_ONLY) - ADD_LIBRARY(libmysql SHARED ${CLIENT_SOURCES} dll.c libmysql.def) +ADD_LIBRARY(libmysql SHARED ${CLIENT_SOURCES} dll.c libmysql.def) +IF(WIN32) 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) +ENDIF(WIN32) +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) |