diff options
| -rw-r--r-- | cmake/ssl.cmake | 2 | ||||
| -rwxr-xr-x | sql/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 44f57899784..2bf9b561bba 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -30,8 +30,10 @@ MACRO (MYSQL_USE_BUNDLED_SSL) #Remove -fno-implicit-templates #(yassl sources cannot be compiled with it) SET(SAVE_CXX_FLAGS ${CXX_FLAGS}) + IF(CMAKE_CXX_FLAGS) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + ENDIF() ADD_SUBDIRECTORY(extra/yassl) ADD_SUBDIRECTORY(extra/yassl/taocrypt) SET(CXX_FLAGS ${SAVE_CXX_FLAGS}) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index b32a66a6c92..28424bd3e50 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -105,8 +105,11 @@ MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE}) IF(NOT WITHOUT_DYNAMIC_PLUGINS) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) + IF(NOT mysqld_link_flags) + SET(mysqld_link_flags) + ENDIF() IF (MINGW OR CYGWIN) - SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "{mysqld_link_flags} -Wl,--export-all-symbols") + SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} -Wl,--export-all-symbols") ENDIF() IF(MSVC) # Set module definition file. Also use non-incremental linker, |