diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-05 18:22:57 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-05 18:22:57 +0000 |
| commit | 3a22d6c136ff5a03012102d9a852c5e16ac612d4 (patch) | |
| tree | 5fff3903fde5ee4234d55e84a77e5f86028922d7 | |
| parent | d9e0c06b5df1665658deb7ee09de119fbdd36fdc (diff) | |
| download | mariadb-git-3a22d6c136ff5a03012102d9a852c5e16ac612d4.tar.gz | |
Fix conf_to_src build.
2cd316911309e3db4007aa224f7874bfbeb14032 broke conf_to_src,
because strings library is now dependend on mysys (my_alloc etc are used
now directly in string lib)
Fix by adding appropriate dependency.
Also exclude conf_to_src from VS IDE builds. EXCLUDE_FROM_ALL
is not enough for that.
| -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 65eeb457f2d..2a7f0b71cc8 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) |