diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-03-04 09:30:05 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-03-04 10:33:01 -0500 |
| commit | 2c174fd98adb34416ccfdfa5e91c754dee20c7bc (patch) | |
| tree | 776ac7c17cd06169bca4a6a1b03eb2d6acf7c866 /20006_all_cmake_elib-mariadb-5.5.33.patch | |
| parent | Remove Werror from mysql and percona-server cmake (diff) | |
| download | mysql-extras-2c174fd98adb34416ccfdfa5e91c754dee20c7bc.tar.gz mysql-extras-2c174fd98adb34416ccfdfa5e91c754dee20c7bc.tar.bz2 mysql-extras-2c174fd98adb34416ccfdfa5e91c754dee20c7bc.zip | |
Add static libs install based on condition
Diffstat (limited to '20006_all_cmake_elib-mariadb-5.5.33.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mariadb-5.5.33.patch | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch b/20006_all_cmake_elib-mariadb-5.5.33.patch index fbb51a7..516abbd 100644 --- a/20006_all_cmake_elib-mariadb-5.5.33.patch +++ b/20006_all_cmake_elib-mariadb-5.5.33.patch @@ -88,15 +88,33 @@ 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-18 22:28:40.429273470 -0100 +++ mysql/libmysql/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 -@@ -329,7 +329,7 @@ +@@ -327,9 +327,14 @@ + SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) + ++SET(INSTALL_STATIC_LIBS "") ++IF(NOT ENABLE_STATIC_LIBS) ++ SET(INSTALL_STATIC_LIBS "NOINSTALL") ++ENDIF() ++ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. -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 IF(MSVC) +@@ -350,7 +355,9 @@ + SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION}) + ENDIF() + ENDMACRO() +- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ++ IF(ENABLE_STATIC_LIBS) ++ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${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-18 22:28:40.090273457 -0100 +++ mysql/libmysqld/CMakeLists.txt 2014-01-18 22:28:53.025273949 -0100 @@ -127,3 +145,13 @@ 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 @@ + logger_service.c) + + ADD_CONVENIENCE_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() |