Commit 43460839 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-21795 10.5 with bundled pcre2 and embedded server could not be built

partially reverting 961413d2
parent 7180afa0
...@@ -11,13 +11,14 @@ MACRO(BUNDLE_PCRE2) ...@@ -11,13 +11,14 @@ MACRO(BUNDLE_PCRE2)
FOREACH(lib pcre2-posix pcre2-8) FOREACH(lib pcre2-posix pcre2-8)
ADD_LIBRARY(${lib} STATIC IMPORTED GLOBAL) ADD_LIBRARY(${lib} STATIC IMPORTED GLOBAL)
ADD_DEPENDENCIES(${lib} pcre2) ADD_DEPENDENCIES(${lib} pcre2)
SET(file ${dir}/src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
IF(WIN32) IF(WIN32)
# Debug libary name. # Debug libary name.
# Same condition as in pcre2 CMakeLists.txt that adds "d" # 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}) SET(file_d ${dir}/src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}d${CMAKE_STATIC_LIBRARY_SUFFIX})
SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d}) SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d})
ELSE() ELSE()
SET(file ${dir}/src/pcre2-build/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
SET(file_d) SET(file_d)
ENDIF() ENDIF()
SET(byproducts ${byproducts} BUILD_BYPRODUCTS ${file} ${file_d}) SET(byproducts ${byproducts} BUILD_BYPRODUCTS ${file} ${file_d})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment