diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
| commit | 8ae8cd63485eb063de0b70ea6f3acf7102a61fef (patch) | |
| tree | 70fa448baa769b6c8c331063a61bf929ad61c976 /sql/CMakeLists.txt | |
| parent | 6857cb57fe7090f131b272f31485b7a478a0b324 (diff) | |
| parent | 387bdf07ae0973bc3e4dc3f5064d2a29c64bb769 (diff) | |
| download | mariadb-git-8ae8cd63485eb063de0b70ea6f3acf7102a61fef.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index f71c43daaec..b3c99cc4788 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -245,6 +245,7 @@ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) SET(CMAKE_CONFIGURABLE_FILE_CONTENT " IF ((mysqld_lib.def IS_NEWER_THAN mysqld_lib.lib) OR (mysqld_lib.def IS_NEWER_THAN mysqld_lib.exp)) + FILE(REMOVE mysqld_lib.lib mysqld_lib.exp) SET(ENV{VS_UNICODE_OUTPUT}) EXECUTE_PROCESS ( COMMAND \"${CMAKE_LINKER}\" /lib /NAME:mysqld.exe \"/DEF:${MYSQLD_DEF}\" /MACHINE:${_PLATFORM} |