diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-06 17:39:50 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-06 17:39:50 +0000 |
| commit | 59990747bcc88059d21f1f140ba5ec80f60f38f4 (patch) | |
| tree | 24cb8a1ddafc37593aaaf738557fd2e7de5dc3d8 /strings | |
| parent | da39ca1f67dfd10d8b2b656a821f6829106c052b (diff) | |
| parent | 3a22d6c136ff5a03012102d9a852c5e16ac612d4 (diff) | |
| download | mariadb-git-59990747bcc88059d21f1f140ba5ec80f60f38f4.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index 52dc2ed2b0f..1f1e4635f31 100644 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -34,4 +34,5 @@ ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H) ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES}) ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c) -TARGET_LINK_LIBRARIES(conf_to_src strings) +SET_TARGET_PROPERTIES(conf_to_src PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) +TARGET_LINK_LIBRARIES(conf_to_src mysys strings) |