mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 10:38:59 +08:00
06475a3516
Fixes https://github.com/microsoft/vcpkg/issues/38731 Delete upstream merged patch fix-glegl.patch. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [X] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [X] Any patches that are no longer applied are deleted from the port's directory. - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. All features passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` --------- Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <v-wangjim@microsoft.com>
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 7d3f88d..576a28c 100644
|
|
--- a/build/cmake/functions.cmake
|
|
+++ b/build/cmake/functions.cmake
|
|
@@ -453,7 +453,7 @@ macro(wx_add_library name)
|
|
# configure puts the .dll in the bin directory
|
|
set(runtime_dir "bin")
|
|
else()
|
|
- set(runtime_dir "lib")
|
|
+ set(runtime_dir "bin")
|
|
endif()
|
|
wx_install(TARGETS ${name}
|
|
EXPORT wxWidgetsTargets
|
|
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
|
|
index e76dff6..eb4edc0 100644
|
|
--- a/build/cmake/init.cmake
|
|
+++ b/build/cmake/init.cmake
|
|
@@ -156,7 +156,7 @@ if(WIN32)
|
|
endif()
|
|
endif()
|
|
|
|
-if(WIN32_MSVC_NAMING)
|
|
+if(0)
|
|
if(wxBUILD_SHARED)
|
|
set(lib_suffix "_dll")
|
|
else()
|
|
diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
|
|
index 384c683..a662a48 100644
|
|
--- a/build/cmake/install.cmake
|
|
+++ b/build/cmake/install.cmake
|
|
@@ -41,7 +41,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}/bin/wx-config\" \
|
|
)"
|
|
diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
|
|
index dbed8cc..f1da8e3 100644
|
|
--- a/build/cmake/utils/CMakeLists.txt
|
|
+++ b/build/cmake/utils/CMakeLists.txt
|
|
@@ -39,7 +39,7 @@ if(wxUSE_XRC)
|
|
|
|
# Don't use wx_install() here to preserve escaping.
|
|
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${EXE_SUFFIX}\" \
|
|
)"
|