mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
48d15f4db6
* Add wxwidgets example and test port * Fix library processing for export Split original patch. Restore missing appending in the end. Drop libs (generator expression) which don't match build type. * Make wx-config relocatable * Rewrite wrapper * Add missing libjpeg-turbo dependency * Fixup wxrc * Update usage * Validate release/debug consistency * Fixup wx-config symlink * Use non-deprecated license expression * Fix portfile quirks * Transform installation fixup into patch * Fix mingw * Control curl dependency * Add message for linux system package dependencies * Update versions * Resolve linux lib issues * Update versions * Minor amendments * Update versions * Update requirements warning * Update versions * CR request: Move CMakelists.txt to example dir * CR requests: Revise wrapper * Update versions
22 lines
966 B
Diff
22 lines
966 B
Diff
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
|
|
index 902b7c5..ad8d1c4 100644
|
|
--- a/build/cmake/functions.cmake
|
|
+++ b/build/cmake/functions.cmake
|
|
@@ -184,7 +184,6 @@ function(wx_set_target_properties target_name is_base)
|
|
set_target_properties(${target_name}
|
|
PROPERTIES
|
|
OUTPUT_NAME "wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}"
|
|
- OUTPUT_NAME_DEBUG "wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}"
|
|
PREFIX "lib"
|
|
)
|
|
endif()
|
|
@@ -486,7 +485,7 @@ function(wx_set_builtin_target_properties target_name)
|
|
PROPERTIES
|
|
OUTPUT_NAME ${target_name}${lib_unicode}${postfix}
|
|
)
|
|
- if(WIN32)
|
|
+ if(WIN32 AND NOT MINGW)
|
|
set_target_properties(${target_name}
|
|
PROPERTIES
|
|
OUTPUT_NAME_DEBUG ${target_name}${lib_unicode}d
|