mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-08 01:49:07 +08:00
aec505b36b
* [wxwidgets] update to 3.1.6 * Revise nanosvg * Add feature control and dependencies for sound * Add descripton for feature sound * Update versions * Update ports/wxwidgets/vcpkg.json Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> * Fix spacing and version * Remove cmake push/pop * Bump version * Undo change in wrapper * bump version * restore newline * bump version Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: Billy Robert O'Neal <bion@microsoft.com> Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
22 lines
1.0 KiB
Diff
22 lines
1.0 KiB
Diff
diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
|
|
index 52ae69d3f6..f261d5d262 100644
|
|
--- a/build/cmake/config.cmake
|
|
+++ b/build/cmake/config.cmake
|
|
@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib)
|
|
else()
|
|
# For the value like $<$<CONFIG:DEBUG>:LIB_PATH>
|
|
# Or $<$<NOT:$<CONFIG:DEBUG>>:LIB_PATH>
|
|
- string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep})
|
|
- if (NOT dep_name)
|
|
+ if(dep MATCHES "^(.+>):(.+)>$")
|
|
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$<NOT:$<CONFIG:DEBUG>>]])
|
|
+ continue()
|
|
+ elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$<CONFIG:DEBUG>]])
|
|
+ continue()
|
|
+ endif()
|
|
+ set(dep_name "${CMAKE_MATCH_2}")
|
|
+ else()
|
|
set(dep_name ${dep})
|
|
endif()
|
|
endif()
|