f183749b1c
PR: 241533 Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com> Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt
41 lines
1.3 KiB
Text
41 lines
1.3 KiB
Text
--- libmysql/CMakeLists.txt.orig 2019-10-21 05:17:49 UTC
|
|
+++ libmysql/CMakeLists.txt
|
|
@@ -205,7 +205,7 @@ IF(WIN32)
|
|
ENDIF()
|
|
|
|
# Merge several convenience libraries into one big mysqlclient
|
|
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
|
|
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
|
|
TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
|
|
|
|
# Visual Studio users need debug static library for debug projects
|
|
@@ -234,19 +234,22 @@ IF(UNIX)
|
|
ENDMACRO()
|
|
ENDIF()
|
|
|
|
+IF (FALSE)
|
|
IF(UNIX)
|
|
GET_TARGET_NAME(mysqlclient lib_name)
|
|
INSTALL_SYMLINK(mysqlclient
|
|
${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
|
|
${INSTALL_LIBDIR} Development)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
IF(NOT DISABLE_SHARED)
|
|
# Merge several convenience libraries into one big mysqlclient
|
|
# and link them together into shared library.
|
|
MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
|
|
EXPORTS ${CLIENT_API_FUNCTIONS}
|
|
- COMPONENT SharedLibraries)
|
|
+ COMPONENT SharedLibraries NOINSTALL)
|
|
+ IF (FALSE)
|
|
TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
|
|
IF(UNIX)
|
|
# libtool compatability
|
|
@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
|
|
${INSTALL_LIBDIR} SharedLibraries)
|
|
ENDFOREACH()
|
|
ENDIF()
|
|
+ ENDIF()
|
|
ENDIF()
|