Skip to content

M
MariaDB
Commit 20438ead authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

- move ADD_SUBDIRECTORY(extra) outside of WITHOUT_SERVER 

- add INSTALL to shared client library
parent 39a15822
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
CMakeLists.txt
View file @ 20438ead
...@@ -190,9 +190,9 @@ IF(WITH_UNIT_TESTS) ...@@ -190,9 +190,9 @@ IF(WITH_UNIT_TESTS)
ADD_SUBDIRECTORY(unittest/mysys) ADD_SUBDIRECTORY(unittest/mysys)
ENDIF() ENDIF()
ADD_SUBDIRECTORY(extra)
IF(NOT WITHOUT_SERVER) IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(sql/share)
......
libmysql/CMakeLists.txt
View file @ 20438ead
...@@ -168,6 +168,7 @@ IF(NOT DISABLE_SHARED) ...@@ -168,6 +168,7 @@ IF(NOT DISABLE_SHARED)
#(mysqlclient in this case) #(mysqlclient in this case)
SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(libmysql 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) INSTALL_SYMLINK(${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r libmysql lib)
ENDIF() ENDIF()
INSTALL_DEBUG_SYMBOLS(libmysql) INSTALL_DEBUG_SYMBOLS(libmysql)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7