mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 07:09:00 +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
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
|
|
index 902b7c5..dba3d07 100644
|
|
--- a/build/cmake/functions.cmake
|
|
+++ b/build/cmake/functions.cmake
|
|
@@ -374,7 +374,7 @@ macro(wx_add_library name)
|
|
wx_install(TARGETS ${name}
|
|
LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}"
|
|
ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}"
|
|
- RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}"
|
|
+ RUNTIME DESTINATION "bin"
|
|
BUNDLE DESTINATION Applications/wxWidgets
|
|
)
|
|
endif()
|
|
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
|
|
index 0bc4f93..65fe3b8 100644
|
|
--- a/build/cmake/init.cmake
|
|
+++ b/build/cmake/init.cmake
|
|
@@ -149,7 +149,7 @@ else()
|
|
set(wxCOMPILER_PREFIX)
|
|
endif()
|
|
|
|
-if(MSVC)
|
|
+if(MSVC AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR)
|
|
if(wxBUILD_SHARED)
|
|
set(lib_suffix "dll")
|
|
else()
|
|
diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
|
|
index 968dff8..5b4fda9 100644
|
|
--- a/build/cmake/install.cmake
|
|
+++ b/build/cmake/install.cmake
|
|
@@ -45,7 +45,7 @@ else()
|
|
|
|
install(DIRECTORY DESTINATION "bin")
|
|
install(CODE "execute_process( \
|
|
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
|
+ COMMAND ${CMAKE_COMMAND} -E copy \
|
|
${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \
|
|
${CMAKE_INSTALL_PREFIX}/bin/wx-config \
|
|
)"
|
|
diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
|
|
index 4108d6a..19d730e 100644
|
|
--- a/build/cmake/utils/CMakeLists.txt
|
|
+++ b/build/cmake/utils/CMakeLists.txt
|
|
@@ -39,7 +39,7 @@ if(wxUSE_XRC)
|
|
)"
|
|
)
|
|
install(CODE "execute_process( \
|
|
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
|
+ COMMAND ${CMAKE_COMMAND} -E copy \
|
|
${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
|
|
${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
|
|
)"
|