diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-03-08 18:00:55 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-03-08 18:00:55 +0100 |
| commit | 449871458b49f224b27b26858784ef5408353f1b (patch) | |
| tree | d3fd6bdaf34a2ecbe738a46cee02b478199c6c78 | |
| parent | d2ddf82a0e3e5cf756cacfe043bb116a47b7fd31 (diff) | |
| download | mariadb-git-449871458b49f224b27b26858784ef5408353f1b.tar.gz | |
Fix Windows clang build with newest cmake
| -rw-r--r-- | cmake/pcre.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake index 1a5dece481a..214e1413ae2 100644 --- a/cmake/pcre.cmake +++ b/cmake/pcre.cmake @@ -14,8 +14,14 @@ 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}) + IF(GENERATOR_IS_MULTI_CONFIG) + 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}) |