diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-15 13:38:18 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-05-15 13:38:18 +0200 |
| commit | 19f0d6b2d9930f83688943b8f98a8b7397584df9 (patch) | |
| tree | 08c9b040b07dfcf337c7a94244b0dd5ff5ccb7ff /libmysql | |
| parent | 2982738e48cf47162251d318c44b13801ea4804f (diff) | |
| download | mariadb-git-19f0d6b2d9930f83688943b8f98a8b7397584df9.tar.gz | |
Small CMake fixes :
- add version info for the client library, dynamic plugins and some utilities
- do not recompile client library sources 3 times (for mysqlclient , mysqlclient_notls and libmysql)
One time is sufficient, so get rid of mysqlclient_notls, and link static client library to the shared.
- remove incremental linking flag
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index c748f9b073f..4ac0b9a01ee 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -110,18 +110,16 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c ADD_LIBRARY(mysqlclient STATIC ${CLIENT_SOURCES}) 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) +SET(SHARED_SOURCES dll.c libmysql.def) +ADD_VERSION_INFO(libmysql SHARED SHARED_SOURCES) +ADD_LIBRARY(libmysql SHARED ${SHARED_SOURCES}) -ADD_LIBRARY(libmysql SHARED ${CLIENT_SOURCES} dll.c libmysql.def) IF(WIN32) SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS") ENDIF(WIN32) ADD_DEPENDENCIES(libmysql GenError) -TARGET_LINK_LIBRARIES(libmysql wsock32) +TARGET_LINK_LIBRARIES(libmysql mysqlclient ws2_32) ADD_DEFINITIONS(-DHAVE_DLOPEN) MYSQL_INSTALL_TARGETS(mysqlclient DESTINATION lib COMPONENT Development) |