diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 19:44:41 +0200 |
| commit | 6dd302d164d13d6c4793af9f03412ee092652226 (patch) | |
| tree | 40a566b6c1971bbf8bbf9d4e36c42f17dad84ef3 /strings | |
| parent | 0ca2ea1a6550bb718efc878ed451be69e8244cd4 (diff) | |
| parent | cca611d1c083286396e34d8fc242bbeb90f01d2a (diff) | |
| download | mariadb-git-6dd302d164d13d6c4793af9f03412ee092652226.tar.gz | |
Merge bb-10.2-ext into 10.3
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) |