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-mysql-5.6.15.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-mysql-5.6.15.patch')
| -rw-r--r-- | 20006_all_cmake_elib-mysql-5.6.15.patch | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/20006_all_cmake_elib-mysql-5.6.15.patch b/20006_all_cmake_elib-mysql-5.6.15.patch index 735cfa8..66b7280 100644 --- a/20006_all_cmake_elib-mysql-5.6.15.patch +++ b/20006_all_cmake_elib-mysql-5.6.15.patch @@ -126,12 +126,18 @@ 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-20 00:14:06.453799634 -0100 +++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100 -@@ -127,7 +127,7 @@ +@@ -126,8 +126,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 Embedded) -+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR}) ++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS}) # Visual Studio users need debug static library IF(MSVC) |