diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2015-11-09 12:29:26 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2015-11-09 12:29:26 +0100 |
commit | 1694d813997198e86f6a8aa6aefffb687c9992dd (patch) | |
tree | 8cf24d842eb14f43270561ecfead56bd3d76aca1 /pcre | |
parent | f1daf9ced46ba65b025a92f512833c86d04e7cf2 (diff) | |
download | mariadb-git-1694d813997198e86f6a8aa6aefffb687c9992dd.tar.gz |
MDEV-8533 Debug embedded server does not build on Windows
pre/CMakeLists.txt defines CMAKE_DEBUG_POSTFIX which causes a different
library name on Windows debug build (pcred.lib rather than pre.lib)
However MERGE_LIBRARIES macro that is used to create static embedded
library (out of other static libraries), can not handle per-configuration
library names. Thus the build fails with "pre.lib not found"
Fix is to remove unnecessary CMAKE_DEBUG_POSTFIX
Diffstat (limited to 'pcre')
-rw-r--r-- | pcre/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pcre/CMakeLists.txt b/pcre/CMakeLists.txt index 90ebc0d5100..a4faef6f47a 100644 --- a/pcre/CMakeLists.txt +++ b/pcre/CMakeLists.txt @@ -311,11 +311,6 @@ IF(MSVC) ENDIF(MSVC) SET(CMAKE_INCLUDE_CURRENT_DIR 1) -# needed to make sure to not link debug libs -# against release libs and vice versa -IF(WIN32) - SET(CMAKE_DEBUG_POSTFIX "d") -ENDIF(WIN32) SET(targets) |