- move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVER

- add INSTALL to shared client library

- move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVER
- add INSTALL to shared client library
20438ead · Vladislav Vaintroub · 39a15822 · 20438ead · 20438ead
Commit 20438ead authored Nov 25, 2009 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +1 -1

libmysql/CMakeLists.txt libmysql/CMakeLists.txt +1 -0

No files found.
--- 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)

--- 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)