From d6639476c960c995eef16ad260a362d555e49e0e Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@tuffmail.com>
Date: Mon, 10 Mar 2014 16:02:15 -0400
Subject: Add static-libs install to patches for embedded as well

---
 20006_all_cmake_elib-percona-5.5.35.patch | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to '20006_all_cmake_elib-percona-5.5.35.patch')

diff --git a/20006_all_cmake_elib-percona-5.5.35.patch b/20006_all_cmake_elib-percona-5.5.35.patch
index 65f53a5..1d41852 100644
--- a/20006_all_cmake_elib-percona-5.5.35.patch
+++ b/20006_all_cmake_elib-percona-5.5.35.patch
@@ -123,12 +123,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)
-- 
cgit v1.2.3-65-gdbad