diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 13:46:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 13:46:54 +0300 |
| commit | 7dcb8816a1ef080fae588f75e504859087d91aec (patch) | |
| tree | 286a7c17f5651ca9f7aa306080a28b5677cb0f91 /sql/CMakeLists.txt | |
| parent | 8acb2b7b28d58689071d8adec4e41074a17d6c0f (diff) | |
| parent | 84be33abe010afa07c8cfe24d4c44be5d117ed22 (diff) | |
| download | mariadb-git-7dcb8816a1ef080fae588f75e504859087d91aec.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 359ecdb4bcb..f856c313ce8 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -374,18 +374,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() CONFIGURE_FILE( |