cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problems with CMake install target

Browse Source 
Handle DESDIR and spaces in the installation path correctly.

Closes #22610.

(cherry picked from commit 43d0eb48c15ab87ecb8d20a145f9f374f4ff745e)
This commit is contained in:
Vadim Zeitlin 2022-07-24 17:09:32 +02:00
parent 34ab0ac7f0
commit 664d1617be
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/install.cmake
View File

@ -42,8 +42,8 @@ else()
install(DIRECTORY DESTINATION "bin") install(DIRECTORY DESTINATION "bin")
install(CODE "execute_process( \ install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \ COMMAND ${CMAKE_COMMAND} -E create_symlink \
${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
${CMAKE_INSTALL_PREFIX}/bin/wx-config \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
)" )"
) )
endif() endif()

9
build/cmake/utils/CMakeLists.txt
View File

@ -30,17 +30,18 @@ if(wxUSE_XRC)
BUNDLE DESTINATION "bin" BUNDLE DESTINATION "bin"
) )
if(NOT WIN32_MSVC_NAMING) if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL)
if(IPHONE) if(IPHONE)
set(EXE_SUFFIX ".app") set(EXE_SUFFIX ".app")
else() else()
set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX}) set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX})
endif() endif()
wx_install(CODE "execute_process( \ # Don't use wx_install() here to preserve escaping.
install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E create_symlink \ COMMAND ${CMAKE_COMMAND} -E create_symlink \
${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \ \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
)" )"
) )
endif() endif()