48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
--- a/build/cmake/config.cmake
|
|
+++ b/build/cmake/config.cmake
|
|
@@ -92,7 +92,7 @@
|
|
"wx-config-inplace.in"
|
|
"inplace-${TOOLCHAIN_FULLNAME}"
|
|
)
|
|
- if(WIN32_MSVC_NAMING)
|
|
+ if(WIN32)
|
|
set(COPY_CMD copy)
|
|
else()
|
|
set(COPY_CMD create_symlink)
|
|
--- a/build/cmake/install.cmake
|
|
+++ b/build/cmake/install.cmake
|
|
@@ -61,9 +61,14 @@
|
|
WORLD_EXECUTE WORLD_READ
|
|
)
|
|
|
|
+ if(WIN32)
|
|
+ set(COPY_CMD copy)
|
|
+ else()
|
|
+ set(COPY_CMD create_symlink)
|
|
+ endif()
|
|
install(DIRECTORY DESTINATION "bin")
|
|
install(CODE "execute_process( \
|
|
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
|
+ COMMAND ${CMAKE_COMMAND} -E ${COPY_CMD} \
|
|
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
|
|
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
|
|
)"
|
|
--- a/build/cmake/utils/CMakeLists.txt
|
|
+++ b/build/cmake/utils/CMakeLists.txt
|
|
@@ -37,9 +37,14 @@
|
|
set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX})
|
|
endif()
|
|
|
|
+ if(WIN32)
|
|
+ set(COPY_CMD copy)
|
|
+ else()
|
|
+ set(COPY_CMD create_symlink)
|
|
+ endif()
|
|
# Don't use wx_install() here to preserve escaping.
|
|
install(CODE "execute_process( \
|
|
- COMMAND ${CMAKE_COMMAND} -E create_symlink \
|
|
+ COMMAND ${CMAKE_COMMAND} -E ${COPY_CMD} \
|
|
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
|
|
\"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
|
|
)"
|