mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 12:31:36 +08:00
b98afc9f11
* Update to 10.40 * Drop '-static' suffix for MSVC The suffix breaks pc files. Renaming allowed by maintainer guidelines, to facilitate downstream usage. * Update versions
34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index fa2181e..3bf5317 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -711,8 +711,8 @@ IF(PCRE2_BUILD_PCRE2_8)
|
|
SET(targets ${targets} pcre2-posix-static)
|
|
|
|
IF(MSVC)
|
|
- SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static)
|
|
- SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static)
|
|
+ SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
|
|
+ SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
|
|
ELSE(MSVC)
|
|
SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8)
|
|
SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix)
|
|
@@ -777,7 +777,7 @@ IF(PCRE2_BUILD_PCRE2_16)
|
|
SET(targets ${targets} pcre2-16-static)
|
|
|
|
IF(MSVC)
|
|
- SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static)
|
|
+ SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
|
|
ELSE(MSVC)
|
|
SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16)
|
|
ENDIF(MSVC)
|
|
@@ -829,7 +829,7 @@ IF(PCRE2_BUILD_PCRE2_32)
|
|
SET(targets ${targets} pcre2-32-static)
|
|
|
|
IF(MSVC)
|
|
- SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static)
|
|
+ SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
|
|
ELSE(MSVC)
|
|
SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32)
|
|
ENDIF(MSVC)
|