diff options
| author | Vladislav Vaintroub <vvaintroub@koala> | 2009-11-25 05:13:51 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@koala> | 2009-11-25 05:13:51 +0100 |
| commit | 39a158221ddac1c83766fe0b4635d854a664f262 (patch) | |
| tree | 26bb5c1d3ec68a6840888eb5cf866fe2396e6a70 /libmysql/CMakeLists.txt | |
| parent | 23cd3cec41afcd443a666b614ceb79d726664ead (diff) | |
| download | mariadb-git-39a158221ddac1c83766fe0b4635d854a664f262.tar.gz | |
add --disable-shared equivalent
fix mtr (empty argument passed to mysqld)
Diffstat (limited to 'libmysql/CMakeLists.txt')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index c6047c0c4c5..4286ea2bb0b 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -153,18 +153,22 @@ SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES}) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. MERGE_LIBRARIES(mysqlclient STATIC ${LIBS}) -MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}) +INSTALL(TARGETS mysqlclient DESTINATION lib) IF(UNIX) - # Name of shared library is mysqlclient on Unix - SET_TARGET_PROPERTIES(libmysql PROPERTIES OUTPUT_NAME mysqlclient) - # clean direct output needs to be set several targets have the same name - #(mysqlclient in this case) - SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) - # Install links to shared and static libraries - # (append _r to base name) - INSTALL_SYMLINK(${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r libmysql lib) - INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r mysqlclient lib) + INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r mysqlclient lib) ENDIF() +INSTALL_DEBUG_SYMBOLS(mysqlclient) -INSTALL(TARGETS mysqlclient libmysql DESTINATION lib) -INSTALL_DEBUG_SYMBOLS("mysqlclient;libmysql") +IF(NOT DISABLE_SHARED) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}) + IF(UNIX) + # Name of shared library is mysqlclient on Unix + SET_TARGET_PROPERTIES(libmysql PROPERTIES OUTPUT_NAME mysqlclient) + # clean direct output needs to be set several targets have the same name + #(mysqlclient in this case) + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) + SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) + INSTALL_SYMLINK(${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r libmysql lib) + ENDIF() + INSTALL_DEBUG_SYMBOLS(libmysql) +ENDIF() |