diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:50:25 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-04 14:50:25 +0100 |
| commit | 4fb2cb1a30fc188682ae4dbda2f975213e5c3adf (patch) | |
| tree | 522b2dc8096cc37ace66686de36b486b73a352f5 /sql/CMakeLists.txt | |
| parent | c0f5fd27549c84607defa64c5b651343dd29e0ee (diff) | |
| parent | 9ed8deb656d9378fc9c1c7fb12c15674b6323ab0 (diff) | |
| download | mariadb-git-4fb2cb1a30fc188682ae4dbda2f975213e5c3adf.tar.gz | |
Merge branch '10.7' into 10.8
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index dc1f32187e8..8aadc22046e 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2014, Oracle and/or its affiliates. -# Copyright (c) 2010, 2021, MariaDB Corporation. +# Copyright (c) 2010, 2022, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -486,7 +486,8 @@ IF(WIN32) password.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 mysys_ssl shlwapi) ADD_LIBRARY(winservice STATIC winservice.c) |