diff options
| author | Vladislav Vaintroub <vvaintroub@koala> | 2009-11-25 07:28:45 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@koala> | 2009-11-25 07:28:45 +0100 |
| commit | ff57321f8ce404a298f898a03f80bf31a0620e94 (patch) | |
| tree | 6da37d0573579f98e9bc75adca701d8263a90ff5 | |
| parent | 2f3e777797a643284ffdd0f31c820497097ab451 (diff) | |
| download | mariadb-git-ff57321f8ce404a298f898a03f80bf31a0620e94.tar.gz | |
- move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVER
- add INSTALL to shared client library
| -rwxr-xr-x | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | libmysql/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d2f0ab457..2b5e5464001 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,9 +190,9 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/mysys) ENDIF() +ADD_SUBDIRECTORY(extra) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/share) diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 4286ea2bb0b..4fb6e10409d 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -168,6 +168,7 @@ 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) |