diff options
| author | unknown <iggy@amd64.(none)> | 2007-08-04 02:51:58 -0400 |
|---|---|---|
| committer | unknown <iggy@amd64.(none)> | 2007-08-04 02:51:58 -0400 |
| commit | 06cb99ca5aab1a2b1aa65990ef0ddda6e34509ec (patch) | |
| tree | 90d912386bf83c7e96e9ee9af8d89b2c3b163e2c /libmysql/CMakeLists.txt | |
| parent | e8469adb1782b7c9bc4b79aae000ac7e640828d9 (diff) | |
| download | mariadb-git-06cb99ca5aab1a2b1aa65990ef0ddda6e34509ec.tar.gz | |
Post Merge Fixup.
Diffstat (limited to 'libmysql/CMakeLists.txt')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 46e651f6a64..2e6ca55e618 100755 --- a/libmysql/CMakeLists.txt +++ b/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) |