diff --git a/dependencies/vcpkg_overlay_ports/wxwidgets/install-layout.patch b/dependencies/vcpkg_overlay_ports/wxwidgets/install-layout.patch index 1ad1f23f..6ec4db46 100644 --- a/dependencies/vcpkg_overlay_ports/wxwidgets/install-layout.patch +++ b/dependencies/vcpkg_overlay_ports/wxwidgets/install-layout.patch @@ -1,8 +1,8 @@ diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index e76dff6..eb4edc0 100644 +index f044d22d4d..48fc5ad072 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake -@@ -156,7 +156,7 @@ if(WIN32) +@@ -198,7 +198,7 @@ if(WIN32) endif() endif() @@ -12,20 +12,20 @@ index e76dff6..eb4edc0 100644 set(lib_suffix "_dll") else() diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake -index 384c683..a662a48 100644 +index a373983043..2e1ace7bf9 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake -@@ -41,7 +41,7 @@ else() +@@ -63,7 +63,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}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ )" diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt -index dbed8cc..f1da8e3 100644 +index 15f4339ef9..f93849e025 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt @@ -39,7 +39,7 @@ if(wxUSE_XRC) @@ -34,6 +34,6 @@ index dbed8cc..f1da8e3 100644 install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ - \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ )" diff --git a/dependencies/vcpkg_overlay_ports/wxwidgets/portfile.cmake b/dependencies/vcpkg_overlay_ports/wxwidgets/portfile.cmake index 82dc7b9d..12491480 100644 --- a/dependencies/vcpkg_overlay_ports/wxwidgets/portfile.cmake +++ b/dependencies/vcpkg_overlay_ports/wxwidgets/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets REF "v${VERSION}" - SHA512 a6704b54b6535a3a66b036c2563753575fc01bf735ec7f9cae6600390554f95f28cb50041fc3570f149924f4a3d99771fecdfa2d1ccdf12496cf8a2cf763b96b + SHA512 8ad17582c4ba721ffe76ada4bb8bd7bc4b050491220aca335fd0506a51354fb789d5bc3d965f0f459dc81784d6427c88272e2acc2099cddf73730231b5a16f62 HEAD_REF master PATCHES install-layout.patch diff --git a/dependencies/vcpkg_overlay_ports/wxwidgets/vcpkg.json b/dependencies/vcpkg_overlay_ports/wxwidgets/vcpkg.json index adf7c135..132f4fe3 100644 --- a/dependencies/vcpkg_overlay_ports/wxwidgets/vcpkg.json +++ b/dependencies/vcpkg_overlay_ports/wxwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wxwidgets", - "version": "3.3.0", + "version": "3.3.1", "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/vcpkg.json b/vcpkg.json index 53febd2e..4ec28b3e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -75,7 +75,7 @@ }, { "name": "wxwidgets", - "version": "3.3.0" + "version": "3.3.1" } ] }