diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-11 20:20:07 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-11 20:20:07 +0200 |
| commit | a43ff483faac41f33a37c5699b7aa9053d2dbe28 (patch) | |
| tree | 0990b3c1fc54faaf21e9a30348cd43328b3611f2 /cmake | |
| parent | 7a4fbb55b02b449a135fe935f624422eaacfdd7c (diff) | |
| parent | a4b7232b2cfd504057c26f9b40a2dacf064dca73 (diff) | |
| download | mariadb-git-a43ff483faac41f33a37c5699b7aa9053d2dbe28.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/pcre.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake index 1a5dece481a..208f9ee755e 100644 --- a/cmake/pcre.cmake +++ b/cmake/pcre.cmake @@ -14,8 +14,15 @@ MACRO(BUNDLE_PCRE2) IF(WIN32) # Debug libary name. # Same condition as in pcre2 CMakeLists.txt that adds "d" - SET(file ${dir}/src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}) - SET(file_d ${dir}/src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}d${CMAKE_STATIC_LIBRARY_SUFFIX}) + GET_PROPERTY(MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + IF(MULTICONFIG) + SET(intdir "${CMAKE_CFG_INTDIR}/") + ELSE() + SET(intdir) + ENDIF() + + SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}) + SET(file_d ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}d${CMAKE_STATIC_LIBRARY_SUFFIX}) SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d}) ELSE() SET(file ${dir}/src/pcre2-build/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}) |