diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-12 02:03:05 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-12 02:03:05 +0100 |
| commit | c5d7bcf3761aab79ff0bd49b9a9f7565583ebd58 (patch) | |
| tree | 4007236a6bd4922f17a327fd7e196d8bda1a9350 /libmysql | |
| parent | 91d9e6b670a51c9ace94a2d9439fa11a3335cff0 (diff) | |
| download | mariadb-git-c5d7bcf3761aab79ff0bd49b9a9f7565583ebd58.tar.gz | |
Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined with
INSTALL_DEBUG_SYMBOLS
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index db7d2ee2468..a2ccd8f340d 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -153,14 +153,14 @@ 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}) -INSTALL(TARGETS mysqlclient DESTINATION lib) +MYSQL_INSTALL_TARGETS(mysqlclient DESTINATION lib) IF(UNIX) INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r mysqlclient lib) ENDIF() -INSTALL_DEBUG_SYMBOLS(mysqlclient) IF(NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}) + MYSQL_INSTALL_TARGETS(libmysql DESTINATION lib) IF(UNIX) # Name of shared library is mysqlclient on Unix SET_TARGET_PROPERTIES(libmysql PROPERTIES @@ -179,8 +179,6 @@ IF(NOT DISABLE_SHARED) #(mysqlclient in this case) SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) - INSTALL(TARGETS libmysql DESTINATION lib) INSTALL_SYMLINK(${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r libmysql lib) ENDIF() - INSTALL_DEBUG_SYMBOLS(libmysql) ENDIF() |