diff options
Diffstat (limited to '20006_all_cmake_elib-mysql-5.6.15.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mysql-5.6.15.patch | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/20006_all_cmake_elib-mysql-5.6.15.patch b/20006_all_cmake_elib-mysql-5.6.15.patch index 5dd5f0c..735cfa8 100644 --- a/20006_all_cmake_elib-mysql-5.6.15.patch +++ b/20006_all_cmake_elib-mysql-5.6.15.patch @@ -93,14 +93,36 @@ diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt --- mysql-old/libmysql/CMakeLists.txt 2014-01-20 00:14:06.580799638 -0100 +++ mysql/libmysql/CMakeLists.txt 2014-01-20 00:15:27.647802721 -0100 -@@ -165,6 +165,6 @@ - +@@ -179,8 +179,13 @@ + LIST(APPEND LIBS auth_win_client) + ENDIF() + ++SET(INSTALL_STATIC_LIBS "") ++IF(NOT ENABLE_STATIC_LIBS) ++ SET(INSTALL_STATIC_LIBS "NOINSTALL") ++ENDIF() ++ # Merge several convenience libraries into one big mysqlclient -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR}) - ++MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS}) + # Visual Studio users need debug static library for debug projects INSTALL_DEBUG_SYMBOLS(clientlib) +@@ -211,9 +216,11 @@ + + IF(UNIX) + GET_TARGET_NAME(mysqlclient lib_name) +- INSTALL_SYMLINK(mysqlclient +- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a +- ${INSTALL_LIBDIR} Development) ++ IF(ENABLE_STATIC_LIBS) ++ INSTALL_SYMLINK(mysqlclient ++ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a ++ ${INSTALL_LIBDIR} Development) ++ ENDIF() + ENDIF() + + IF(NOT DISABLE_SHARED) diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt --- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100 +++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100 @@ -130,3 +152,14 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt IF(UNIX) # Name the shared library, handle versioning (provides same api as client library # hence the same version) +--- mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500 ++++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500 +@@ -26,4 +26,6 @@ + my_thread_scheduler_service.c) + + ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) +-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++IF(ENABLE_STATIC_LIBS) ++ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) ++ENDIF() + |