blob: 69be32928cbeb228f54a8fa4ff45dd71c528c51c [file] [log] [blame]
Andrew Geissler9aee5002022-03-30 16:27:02 +00001There are errors during do install. So link files 'wx-config' and 'wxrc' are
2not created, and rename failed either:
3
4| CMake Error: failed to create symbolic link '/usr/bin/wx-config': Permission denied
5| Error renaming from "/usr/bin/wxrc" to "/usr/bin/wxrc-3.1": No such file or directory
6| CMake Error: failed to create symbolic link '/usr/bin/wxrc': Permission denied
7
8Respect variable 'DESTDIR' to make it work as expect.
9
10Upstream-Status: Pending
11
12Signed-off-by: Kai Kang <kai.kang@windriver.com>
13---
14 build/cmake/install.cmake | 4 ++--
15 build/cmake/utils/CMakeLists.txt | 8 ++++----
16 2 files changed, 6 insertions(+), 6 deletions(-)
17
18diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
19index c850c51844..5cbc67daa1 100644
20--- a/build/cmake/install.cmake
21+++ b/build/cmake/install.cmake
22@@ -46,8 +46,8 @@ else()
23 install(DIRECTORY DESTINATION "bin")
24 install(CODE "execute_process( \
25 COMMAND ${CMAKE_COMMAND} -E create_symlink \
26- ${CMAKE_INSTALL_PREFIX}/lib${wxPLATFORM_LIB_DIR}/wx/config/${wxBUILD_FILE_ID} \
27- ${CMAKE_INSTALL_PREFIX}/bin/wx-config \
28+ ../lib${wxPLATFORM_LIB_DIR}/wx/config/${wxBUILD_FILE_ID} \
29+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config \
30 )"
31 )
32 endif()
33diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
34index 4108d6a723..fbac6bb533 100644
35--- a/build/cmake/utils/CMakeLists.txt
36+++ b/build/cmake/utils/CMakeLists.txt
37@@ -34,14 +34,14 @@ if(wxUSE_XRC)
38 if(NOT MSVC)
39 install(CODE "execute_process( \
40 COMMAND ${CMAKE_COMMAND} -E rename \
41- ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
42- ${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
43+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
44+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
45 )"
46 )
47 install(CODE "execute_process( \
48 COMMAND ${CMAKE_COMMAND} -E create_symlink \
49- ${CMAKE_INSTALL_PREFIX}/bin/wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
50- ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
51+ wxrc-${wxMAJOR_VERSION}.${wxMINOR_VERSION}${EXE_SUFFIX} \
52+ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
53 )"
54 )
55 endif()