diff options
| author | Vladislav Vaintroub <wlad@sol> | 2009-12-01 18:28:13 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sol> | 2009-12-01 18:28:13 +0000 |
| commit | f7269ba0c7726b94f1dcc1be06dedb8ea2357bb4 (patch) | |
| tree | 290987a54abdda4cef0ddbe235b6173d037b6b87 /sql/CMakeLists.txt | |
| parent | a2a276b200926a747c7cd2c8d2b8ce420fc2200d (diff) | |
| download | mariadb-git-f7269ba0c7726b94f1dcc1be06dedb8ea2357bb4.tar.gz | |
fix build errors
Diffstat (limited to 'sql/CMakeLists.txt')
| -rwxr-xr-x | sql/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 158f0cbc884..8e2fbc0cac3 100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -96,8 +96,7 @@ IF(MSVC) OUTPUT mysqld_dummy.cc COMMAND cmake ARGS -E touch mysqld_dummy.cc VERBATIM) - SET(MYSQLD_CORE_LIBS ${MYSQLD_CORE_LIBS} sql) - + SET(SQL_LIB sql) ELSE() ADD_EXECUTABLE(mysqld ${SQL_SOURCE}) DTRACE_INSTRUMENT(mysqld) @@ -129,7 +128,8 @@ ENDIF() SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX}) -TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_STATIC_PLUGIN_LIBS} sql mysys dbug strings vio regex ${MYSQLD_CORE_LIBS} +TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_STATIC_PLUGIN_LIBS} + mysys dbug strings vio regex ${SQL_LIB} ${LIBWRAP_LIBRARY} ${ZLIB_LIBRARY} ${SSL_LIBRARIES}) INSTALL(TARGETS mysqld DESTINATION bin) INSTALL_DEBUG_SYMBOLS(mysqld) |