diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-03-10 16:02:15 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-03-10 16:02:15 -0400 |
| commit | d6639476c960c995eef16ad260a362d555e49e0e (patch) | |
| tree | fc822683dc9205c36710e9d3faf9885a5ec2acc9 /20006_all_cmake_elib-mariadb-5.5.33.patch | |
| parent | Add static libs install based on condition (diff) | |
| download | mysql-extras-d6639476c960c995eef16ad260a362d555e49e0e.tar.gz mysql-extras-d6639476c960c995eef16ad260a362d555e49e0e.tar.bz2 mysql-extras-d6639476c960c995eef16ad260a362d555e49e0e.zip | |
Add static-libs install to patches for embedded as well
Diffstat (limited to '20006_all_cmake_elib-mariadb-5.5.33.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mariadb-5.5.33.patch | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/20006_all_cmake_elib-mariadb-5.5.33.patch b/20006_all_cmake_elib-mariadb-5.5.33.patch index 516abbd..33e902b 100644 --- a/20006_all_cmake_elib-mariadb-5.5.33.patch +++ b/20006_all_cmake_elib-mariadb-5.5.33.patch @@ -118,16 +118,22 @@ diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt 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 -@@ -134,7 +134,7 @@ +@@ -133,8 +133,13 @@ + ENDIF() ENDFOREACH() ++SET(INSTALL_STATIC_LIBS "") ++IF(NOT ENABLE_STATIC_LIBS) ++ SET(INSTALL_STATIC_LIBS "NOINSTALL") ++ENDIF() ++ MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} - OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development) -+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development OUTPUT_DIR ${INSTALL_ELIBDIR}) ++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) - # Visual Studio users need debug static library - IF(MSVC) -@@ -142,7 +142,7 @@ + INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) + +@@ -144,7 +149,7 @@ ENDIF() IF(UNIX) @@ -136,7 +142,7 @@ diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) ENDIF() -@@ -161,7 +161,7 @@ +@@ -163,7 +168,7 @@ IF(NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${EMBEDDED_API} @@ -145,13 +151,3 @@ 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() |