diff options
| -rw-r--r-- | cmake/libutils.cmake | 15 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 5198cd3a898..e4b4e980b00 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -279,12 +279,15 @@ ENDFUNCTION() MACRO(RESTRICT_SYMBOL_EXPORTS target) IF(CMAKE_COMPILER_IS_GNUCXX AND UNIX) - GET_TARGET_PROPERTY(COMPILE_FLAGS ${target} COMPILE_FLAGS) - IF(NOT COMPILE_FLAGS) - # Avoid COMPILE_FLAGS-NOTFOUND - SET(COMPILE_FLAGS) + CHECK_C_COMPILER_FLAG("-fvisibility=hidden" HAVE_VISIBILITY_HIDDEN) + IF(HAVE_VISIBILITY_HIDDEN) + GET_TARGET_PROPERTY(COMPILE_FLAGS ${target} COMPILE_FLAGS) + IF(NOT COMPILE_FLAGS) + # Avoid COMPILE_FLAGS-NOTFOUND + SET(COMPILE_FLAGS) + ENDIF() + SET_TARGET_PROPERTIES(${target} PROPERTIES + COMPILE_FLAGS "${COMPILE_FLAGS} -fvisibility=hidden") ENDIF() - SET_TARGET_PROPERTIES(${target} PROPERTIES - COMPILE_FLAGS "${COMPILE_FLAGS} -fvisibility=hidden") ENDIF() ENDMACRO() diff --git a/configure.in b/configure.in index c942ae79665..1bee7e5071b 100644 --- a/configure.in +++ b/configure.in @@ -25,7 +25,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in client/mysqlbinlog.cc:check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.5.99) +AM_INIT_AUTOMAKE(mysql, 5.5.99-m3) AM_CONFIG_HEADER([include/config.h:config.h.in]) # Request support for automake silent-rules if available. diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 8347a4029bb..2ea08902405 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -79,7 +79,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc ../sql/partition_info.cc ../sql/sql_connect.cc ../sql/scheduler.cc ../sql/event_parse_data.cc - ../sql/sql_signal.cc ../sql/rpl_handler.cc ../sql/keycaches.cc + ../sql/sql_signal.cc ../sql/rpl_handler.cc ../sql/sys_vars.cc ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc ${GEN_SOURCES} |