52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
|
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
|
||
|
|
index b5175236e2..8c9275974f 100644
|
||
|
|
--- a/build/cmake/init.cmake
|
||
|
|
+++ b/build/cmake/init.cmake
|
||
|
|
@@ -146,7 +146,7 @@ if(WIN32)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-if(WIN32_MSVC_NAMING)
|
||
|
|
+if(WIN32_MSVC_NAMING AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR)
|
||
|
|
if(wxBUILD_SHARED)
|
||
|
|
set(lib_suffix "_dll")
|
||
|
|
else()
|
||
|
|
index 9e6aafa900..defd196d2e 100644
|
||
|
|
--- a/build/cmake/functions.cmake
|
||
|
|
+++ b/build/cmake/functions.cmake
|
||
|
|
@@ -417,7 +417,7 @@ macro(wx_add_library name)
|
||
|
|
|
||
|
|
# Setup install
|
||
|
|
set(runtime_dir "lib")
|
||
|
|
- if(WIN32 AND NOT WIN32_MSVC_NAMING)
|
||
|
|
+ if(VCPKG_TOOLCHAIN OR (WIN32 AND NOT WIN32_MSVC_NAMING))
|
||
|
|
# configure puts the .dll in the bin directory
|
||
|
|
set(runtime_dir "bin")
|
||
|
|
endif()
|
||
|
|
diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
|
||
|
|
index 7902646ef4..04ccd1aba7 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 2b3a22834d..e0e964db9d 100644
|
||
|
|
--- a/build/cmake/utils/CMakeLists.txt
|
||
|
|
+++ b/build/cmake/utils/CMakeLists.txt
|
||
|
|
@@ -41,7 +41,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} \
|
||
|
|
)"
|