diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:11:46 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:11:46 +0100 |
| commit | 9ed8deb656d9378fc9c1c7fb12c15674b6323ab0 (patch) | |
| tree | 5bc8e7e4182b9e5da99d2a2ba40736f3ac450efe /sql/CMakeLists.txt | |
| parent | 3351dfaab0599268eaf25f9d6995ef128910a8b9 (diff) | |
| parent | d87979b48c614dbba4afd1b235307ee354c27719 (diff) | |
| download | mariadb-git-9ed8deb656d9378fc9c1c7fb12c15674b6323ab0.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 9ec686ef9d9..241b482ab16 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -484,7 +484,10 @@ IF(WIN32) ${CMAKE_CURRENT_BINARY_DIR}/mysql_bootstrap_sql.c COMPONENT Server ) - SET_TARGET_PROPERTIES(mariadb-install-db PROPERTIES COMPILE_FLAGS -DINSTALL_PLUGINDIR=${INSTALL_PLUGINDIR}) + + SET_TARGET_PROPERTIES(mariadb-install-db PROPERTIES COMPILE_DEFINITIONS + "INSTALL_PLUGINDIR=${INSTALL_PLUGINDIR};INSTALL_SHAREDIR=${INSTALL_SHAREDIR}" + ) TARGET_LINK_LIBRARIES(mariadb-install-db mysys shlwapi) ADD_LIBRARY(winservice STATIC winservice.c) |