- move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVER

- add INSTALL to shared client library
16 years ago · 20438eadb4
2 changed files with 2 additions and 1 deletions
--- 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)