mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 03:30:38 +08:00
88b3aedb3b
* Revert "[wxwidgets] Remove debug asserts from Release build. (#25240)"
This reverts commit 6e16931acd.
* Update to 3.1.7
* Update installation layout
* Upstream CMake export is not ready for use
* Update versions
* Remove obsolete patch
* Use msvc layout for mingw on windows
* Add debug-support feature
* Update versions
* Fix condition
* Update versions
* Restore symlink patch
* Update versions
* Remove trace option from test port
* Enable testing without feature debug-support
* Fixup defaults for using without debug support
* Expect wxrc-3.1 for mingw cross builds ("unix" layout)
* Update versions
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
|
|
index 32bd959..74f31ed 100644
|
|
--- a/build/cmake/functions.cmake
|
|
+++ b/build/cmake/functions.cmake
|
|
@@ -418,7 +418,7 @@ macro(wx_add_library name)
|
|
set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short})
|
|
|
|
# Setup install
|
|
- set(runtime_dir "lib")
|
|
+ set(runtime_dir "bin")
|
|
if(WIN32 AND NOT WIN32_MSVC_NAMING)
|
|
# configure puts the .dll in the bin directory
|
|
set(runtime_dir "bin")
|
|
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
|
|
index 3ff14ab..7bd00d3 100644
|
|
--- a/build/cmake/init.cmake
|
|
+++ b/build/cmake/init.cmake
|
|
@@ -146,7 +146,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 84cb9f5..e2f460a 100644
|
|
--- a/build/cmake/install.cmake
|
|
+++ b/build/cmake/install.cmake
|
|
@@ -48,7 +48,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 d6b3465..870897b 100644
|
|
--- a/build/cmake/utils/CMakeLists.txt
|
|
+++ b/build/cmake/utils/CMakeLists.txt
|
|
@@ -38,7 +38,7 @@ if(wxUSE_XRC)
|
|
endif()
|
|
|
|
install(CODE "execute_process( \
|
|
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
|
+ COMMAND ${CMAKE_COMMAND} -E copy \
|
|
${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \
|
|
${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
|
|
)"
|