1 This patch adds an "cmake" option DISABLE_STATIC that prevent |
1 This patch adds an "cmake" option DISABLE_STATIC that prevent |
2 static libraries built from being installed. |
2 static libraries built from being installed. |
3 |
3 |
4 --- a/cmake/libutils.cmake 2016-02-02 00:31:58.000000000 +0100 |
4 --- a/cmake/libutils.cmake |
5 +++ b/cmake/libutils.cmake 2016-03-02 22:54:28.199045221 +0100 |
5 +++ b/cmake/libutils.cmake |
6 @@ -267,7 +267,7 @@ |
6 @@ -267,7 +267,7 @@ MACRO(MERGE_LIBRARIES) |
7 ELSE() |
7 ELSE() |
8 MESSAGE(FATAL_ERROR "Unknown library type") |
8 MESSAGE(FATAL_ERROR "Unknown library type") |
9 ENDIF() |
9 ENDIF() |
10 - IF(NOT ARG_NOINSTALL) |
10 - IF(NOT ARG_NOINSTALL) |
11 + IF(NOT ARG_NOINSTALL AND NOT ( DISABLE_STATIC AND ARG_STATIC ) ) |
11 + IF(NOT ARG_NOINSTALL AND NOT ( DISABLE_STATIC AND ARG_STATIC ) ) |
12 IF(ARG_COMPONENT) |
12 IF(ARG_COMPONENT) |
13 SET(COMP COMPONENT ${ARG_COMPONENT}) |
13 SET(COMP COMPONENT ${ARG_COMPONENT}) |
14 ENDIF() |
14 ENDIF() |
15 |
15 |
16 --- a/CMakeLists.txt 2016-02-02 00:31:58.000000000 +0100 |
16 --- a/CMakeLists.txt |
17 +++ b/CMakeLists.txt 2016-03-02 22:36:49.634297070 +0100 |
17 +++ b/CMakeLists.txt |
18 @@ -206,6 +206,8 @@ |
18 @@ -214,6 +214,8 @@ ELSE() |
19 INCLUDE(mysql_add_executable) |
19 OPTION(WITH_RAPID |
20 |
20 "Build additonal code(plugins) that is located in rapid directory" OFF) |
21 # Handle options |
21 ENDIF() |
22 +OPTION(DISABLE_STATIC |
22 +OPTION(DISABLE_STATIC |
23 + "Don't build static libraries" OFF) |
23 + "Don't build static libraries" OFF) |
24 OPTION(DISABLE_SHARED |
24 OPTION(DISABLE_SHARED |
25 "Don't build shared libraries, compile code as position-dependent" OFF) |
25 "Don't build shared libraries, compile code as position-dependent" OFF) |
26 IF(DISABLE_SHARED) |
26 IF(DISABLE_SHARED) |
27 @@ -223,7 +225,7 @@ |
27 @@ -231,7 +233,7 @@ IF(NOT WITHOUT_SERVER) |
28 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON) |
28 OPTION (WITH_UNIT_TESTS "Compile MySQL with unit tests" ON) |
29 ENDIF() |
29 ENDIF() |
30 OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF) |
30 OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF) |
31 -MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER) |
31 -MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER) |
32 +MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_STATIC DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER) |
32 +MARK_AS_ADVANCED(WITHOUT_SERVER DISABLE_STATIC DISABLE_SHARED FORCE_UNSUPPORTED_COMPILER) |
33 |
33 |
34 |
34 |
35 include(CheckCSourceCompiles) |
35 include(CheckCSourceCompiles) |
36 |
36 |
37 --- a/libservices/CMakeLists.txt 2016-02-02 00:31:58.000000000 +0100 |
37 --- a/libservices/CMakeLists.txt |
38 +++ b/libservices/CMakeLists.txt 2016-03-02 22:53:28.974537132 +0100 |
38 +++ b/libservices/CMakeLists.txt |
39 @@ -34,4 +34,6 @@ |
39 @@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES |
40 security_context_service.c) |
40 mysql_keyring_service.c) |
41 |
41 |
42 ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) |
42 ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) |
43 -INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) |
43 -INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) |
44 +IF(NOT DISABLE_STATIC) |
44 +IF(NOT DISABLE_STATIC) |
45 + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) |
45 + INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) |
46 +ENDIF() |
46 +ENDIF() |
47 |
|