diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-18 23:53:30 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-18 23:53:30 +0100 |
| commit | 54c5a4beefefb8047a3fb1f0259d38e5e8bb664e (patch) | |
| tree | 5bd743311c627949ab06195560ba2e8fc844d41c /sql | |
| parent | b9d05f2b68c29fe906b67276076d3fced7b7b9d4 (diff) | |
| download | mariadb-git-54c5a4beefefb8047a3fb1f0259d38e5e8bb664e.tar.gz | |
Simplify embedding version info into executables with ADD_VERSION_INFO
Diffstat (limited to 'sql')
| -rwxr-xr-x | sql/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index b6f33236675..43f22903aef 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -103,13 +103,14 @@ 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 (MINGW OR CYGWIN) - SET_TARGET_PROPERTIES(mysqld PROPERTIES 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, # incremental appears to crash from time to time,if used with /DEF option - SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "/DEF:mysqld.def /INCREMENTAL:NO") + SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} /DEF:mysqld.def /INCREMENTAL:NO") FOREACH (CORELIB sql mysys dbug strings) GET_TARGET_PROPERTY(LOC ${CORELIB} LOCATION) |