File tree Expand file tree Collapse file tree 1 file changed +12
-5
lines changed Expand file tree Collapse file tree 1 file changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -11,17 +11,24 @@ MACRO(BUNDLE_PCRE2)
11
11
FOREACH (lib pcre2-posix pcre2-8 )
12
12
ADD_LIBRARY (${lib} STATIC IMPORTED GLOBAL )
13
13
ADD_DEPENDENCIES (${lib} pcre2 )
14
- IF (WIN32 ) # same condition as in pcre2 CMakeLists.txt that adds "d"
15
- SET (file ${dir} /src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX} )
16
- SET_TARGET_PROPERTIES (${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${dir} /src/pcre2-build/Debug/${lib}d.lib )
14
+ SET (file ${dir} /src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX} )
15
+ IF (WIN32 )
16
+ # Debug libary name.
17
+ # Same condition as in pcre2 CMakeLists.txt that adds "d"
18
+ SET (file_d ${dir} /src/pcre2-build/${CMAKE_CFG_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}d${CMAKE_STATIC_LIBRARY_SUFFIX} )
19
+ SET_TARGET_PROPERTIES (${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d} )
17
20
ELSE ()
18
- SET (file ${dir} /src/pcre2-build/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX} )
19
- SET (byproducts ${byproducts} BUILD_BYPRODUCTS ${file} )
21
+ SET (file_d )
20
22
ENDIF ()
23
+ SET (byproducts ${byproducts} BUILD_BYPRODUCTS ${file} ${file_d} )
21
24
SET_TARGET_PROPERTIES (${lib} PROPERTIES IMPORTED_LOCATION ${file} )
22
25
ENDFOREACH ()
23
26
FOREACH (v "" "_DEBUG" "_RELWITHDEBINFO" "_RELEASE" "_MINZISEREL" )
24
27
STRING (REPLACE "/WX" "" pcre2_flags${v} "${CMAKE_C_FLAGS${v} }" )
28
+ IF (MSVC )
29
+ # Suppress a warning
30
+ STRING (APPEND pcre2_flags${v} " /wd4244 " )
31
+ ENDIF ()
25
32
ENDFOREACH ()
26
33
ExternalProject_Add (
27
34
pcre2
You can’t perform that action at this time.
0 commit comments