| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | wxWidgets hardcodes libdir with 'lib' and does not support multilib which will |
| 2 | change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable. |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | |
| 6 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 7 | --- |
| 8 | CMakeLists.txt | 2 +- |
| 9 | build/cmake/config.cmake | 2 +- |
| 10 | build/cmake/functions.cmake | 6 +++--- |
| 11 | build/cmake/install.cmake | 6 +++--- |
| 12 | 4 files changed, 8 insertions(+), 8 deletions(-) |
| 13 | |
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 15 | index e30d3db934..8f93c57108 100644 |
| 16 | --- a/CMakeLists.txt |
| 17 | +++ b/CMakeLists.txt |
| 18 | @@ -37,7 +37,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) |
| 19 | # Initialize variables for quick access to wx root dir in sub dirs |
| 20 | set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
| 21 | set(wxBINARY_DIR ${CMAKE_BINARY_DIR}) |
| 22 | -set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib) |
| 23 | +set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${wxPLATFORM_LIB_DIR}) |
| 24 | |
| 25 | # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION |
| 26 | file(READ include/wx/version.h WX_VERSION_H_CONTENTS) |
| 27 | diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake |
| 28 | index 6978cc2725..ed16ee5635 100644 |
| 29 | --- a/build/cmake/config.cmake |
| 30 | +++ b/build/cmake/config.cmake |
| 31 | @@ -52,7 +52,7 @@ function(wx_write_config_inplace) |
| 32 | execute_process( |
| 33 | COMMAND |
| 34 | ${CMAKE_COMMAND} -E create_symlink |
| 35 | - "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" |
| 36 | + "lib${wxPLATFORM_LIB_DIR}/wx/config/inplace-${TOOLCHAIN_FULLNAME}" |
| 37 | "${CMAKE_CURRENT_BINARY_DIR}/wx-config" |
| 38 | ) |
| 39 | endfunction() |
| 40 | diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake |
| 41 | index c33dd3946c..51e47e05b3 100644 |
| 42 | --- a/build/cmake/functions.cmake |
| 43 | +++ b/build/cmake/functions.cmake |
| 44 | @@ -78,9 +78,9 @@ function(wx_set_common_target_properties target_name) |
| 45 | cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN}) |
| 46 | |
| 47 | set_target_properties(${target_name} PROPERTIES |
| 48 | - LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" |
| 49 | - ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" |
| 50 | - RUNTIME_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}" |
| 51 | + LIBRARY_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" |
| 52 | + ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" |
| 53 | + RUNTIME_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" |
| 54 | ) |
| 55 | |
| 56 | if(MSVC) |
| 57 | diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake |
| 58 | index 968dff859e..c850c51844 100644 |
| 59 | --- a/build/cmake/install.cmake |
| 60 | +++ b/build/cmake/install.cmake |
| 61 | @@ -33,11 +33,11 @@ if(MSVC) |
| 62 | else() |
| 63 | wx_install( |
| 64 | DIRECTORY "${wxSETUP_HEADER_PATH}" |
| 65 | - DESTINATION "lib/wx/include") |
| 66 | + DESTINATION "lib${wxPLATFORM_LIB_DIR}/wx/include") |
| 67 | |
| 68 | wx_install( |
| 69 | FILES "${wxOUTPUT_DIR}/wx/config/${wxBUILD_FILE_ID}" |
| 70 | - DESTINATION "lib/wx/config" |
| 71 | + DESTINATION "lib${wxPLATFORM_LIB_DIR}/wx/config" |
| 72 | PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ |
| 73 | GROUP_EXECUTE GROUP_READ |
| 74 | WORLD_EXECUTE WORLD_READ |
| 75 | @@ -46,7 +46,7 @@ else() |
| 76 | install(DIRECTORY DESTINATION "bin") |
| 77 | install(CODE "execute_process( \ |
| 78 | COMMAND ${CMAKE_COMMAND} -E create_symlink \ |
| 79 | - ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ |
| 80 | + ${CMAKE_INSTALL_PREFIX}/lib${wxPLATFORM_LIB_DIR}/wx/config/${wxBUILD_FILE_ID} \ |
| 81 | ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ |
| 82 | )" |
| 83 | ) |