Merge remote-tracking branch 'origin/10.1' into 10.2

59990747 · Vladislav Vaintroub · da39ca1f · 3a22d6c1 · 59990747
Commit 59990747 authored Jan 06, 2018 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

strings/CMakeLists.txt strings/CMakeLists.txt +2 -1

No files found.
--- 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)