wxwidgets/trunk/destdir.patch

   1 diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake
   2 index 9a2ce91d7f..858d6397cb 100644
   3 --- a/build/cmake/install.cmake
   4 +++ b/build/cmake/install.cmake
   5 @@ -43,9 +43,10 @@ else()
   6      install(CODE "execute_process( \
   7          COMMAND ${CMAKE_COMMAND} -E create_symlink \
   8          ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \
   9 -        ${CMAKE_INSTALL_PREFIX}/bin/wx-config \
  10 +        ${CMAKE_CURRENT_BINARY_DIR}/wx-config \
  11          )"
  12      )
  13 +    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wx-config DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
  14  endif()
  15
  16  install(EXPORT wxWidgetsTargets NAMESPACE wx:: DESTINATION "lib/cmake/wxWidgets/${wxPLATFORM_LIB_DIR}")
  17 diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
  18 index 47bca6f34a..e3e9399bca 100644
  19 --- a/build/cmake/utils/CMakeLists.txt
  20 +++ b/build/cmake/utils/CMakeLists.txt
  21 @@ -40,9 +40,10 @@ if(wxUSE_XRC)
  22          wx_install(CODE "execute_process( \
  23              COMMAND ${CMAKE_COMMAND} -E create_symlink \
  24              ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \
  25 -            ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
  26 +            ${CMAKE_CURRENT_BINARY_DIR}/wxrc${EXE_SUFFIX} \
  27              )"
  28          )
  29 +        wx_install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wxrc${EXE_SUFFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
  30      endif()
  31  endif()
  32