diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-23 23:23:05 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-23 23:23:05 +0200 |
| commit | 7128fefa4ce4746ad04158846242f0aec6cf8271 (patch) | |
| tree | bedc9eeb902dd17121160f1cdd22a3129f8964a4 | |
| parent | f6cb4f0a19487879171b2374ebcb71f34cee3024 (diff) | |
| download | mariadb-git-7128fefa4ce4746ad04158846242f0aec6cf8271.tar.gz | |
Fix compile with -DWITHOUT_DYNAMIC_PLUGINS on Unix
| -rw-r--r-- | sql/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | storage/mroonga/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 846df00498f..2e63dac6f02 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -322,18 +322,9 @@ ADD_CUSTOM_TARGET( SET_TARGET_PROPERTIES(GenServerSource PROPERTIES EXCLUDE_FROM_ALL TRUE) IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED) - ADD_LIBRARY(udf_example MODULE udf_example.c) + ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) SET_TARGET_PROPERTIES(udf_example PROPERTIES PREFIX "") - # udf_example depends on strings - IF(WIN32) - IF(MSVC) - SET_TARGET_PROPERTIES(udf_example PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def") - ENDIF() - TARGET_LINK_LIBRARIES(udf_example strings) - ELSE() - # udf_example is using safemutex exported by mysqld - TARGET_LINK_LIBRARIES(udf_example mysqld) - ENDIF() + TARGET_LINK_LIBRARIES(udf_example strings) ENDIF() FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index f728c944bbf..dc88be51184 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt @@ -326,6 +326,9 @@ if(MRN_BUNDLED) STORAGE_ENGINE MODULE_ONLY RECOMPILE_FOR_EMBEDDED LINK_LIBRARIES ${MRN_LIBRARIES}) + if(NOT TARGET mroonga) + return() + endif() else() add_library(mroonga MODULE ${MRN_ALL_SOURCES}) |