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> |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 7 | |
| 8 | Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this |
| 9 | patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass. |
| 10 | |
| 11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 12 | --- |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 13 | CMakeLists.txt | 2 +- |
| 14 | build/cmake/config.cmake | 2 +- |
| 15 | build/cmake/functions.cmake | 4 ++-- |
| 16 | build/cmake/install.cmake | 12 ++++++------ |
| 17 | 4 files changed, 10 insertions(+), 10 deletions(-) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 18 | |
| 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 20 | index a49ecd3883..d469471f38 100644 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 21 | --- a/CMakeLists.txt |
| 22 | +++ b/CMakeLists.txt |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 23 | @@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 24 | # Initialize variables for quick access to wx root dir in sub dirs |
| 25 | set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) |
| 26 | set(wxBINARY_DIR ${CMAKE_BINARY_DIR}) |
| 27 | -set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 28 | +set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX}) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 29 | |
| 30 | # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 31 | file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 32 | diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 33 | index b359560bc0..c59ea60923 100644 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 34 | --- a/build/cmake/config.cmake |
| 35 | +++ b/build/cmake/config.cmake |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 36 | @@ -76,7 +76,7 @@ function(wx_write_config_inplace) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 37 | execute_process( |
| 38 | COMMAND |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 39 | "${CMAKE_COMMAND}" -E ${COPY_CMD} |
| 40 | - "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" |
| 41 | + "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}" |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 42 | "${CMAKE_CURRENT_BINARY_DIR}/wx-config" |
| 43 | ) |
| 44 | endfunction() |
| 45 | diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 46 | index 7182364e5e..55fbebc7ee 100644 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 47 | --- a/build/cmake/functions.cmake |
| 48 | +++ b/build/cmake/functions.cmake |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 49 | @@ -435,8 +435,8 @@ macro(wx_add_library name) |
| 50 | endif() |
| 51 | wx_install(TARGETS ${name} |
| 52 | EXPORT wxWidgetsTargets |
| 53 | - LIBRARY DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" |
| 54 | - ARCHIVE DESTINATION "lib${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" |
| 55 | + LIBRARY DESTINATION "lib${LIB_SUFFIX}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" |
| 56 | + ARCHIVE DESTINATION "lib${LIB_SUFFIX}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" |
| 57 | RUNTIME DESTINATION "${runtime_dir}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}" |
| 58 | BUNDLE DESTINATION Applications/wxWidgets |
| 59 | ) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 60 | diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 61 | index 384c6837b8..d3303faabb 100644 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 62 | --- a/build/cmake/install.cmake |
| 63 | +++ b/build/cmake/install.cmake |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 64 | @@ -29,11 +29,11 @@ if(WIN32_MSVC_NAMING) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 65 | else() |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 66 | install( |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 67 | DIRECTORY "${wxSETUP_HEADER_PATH}" |
| 68 | - DESTINATION "lib/wx/include") |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 69 | + DESTINATION "lib${LIB_SUFFIX}/wx/include") |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 70 | |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 71 | install( |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 72 | FILES "${wxOUTPUT_DIR}/wx/config/${wxBUILD_FILE_ID}" |
| 73 | - DESTINATION "lib/wx/config" |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 74 | + DESTINATION "lib${LIB_SUFFIX}/wx/config" |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 75 | PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ |
| 76 | GROUP_EXECUTE GROUP_READ |
| 77 | WORLD_EXECUTE WORLD_READ |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 78 | @@ -42,13 +42,13 @@ else() |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 79 | install(DIRECTORY DESTINATION "bin") |
| 80 | install(CODE "execute_process( \ |
| 81 | COMMAND ${CMAKE_COMMAND} -E create_symlink \ |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 82 | - \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ |
| 83 | + \"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wx/config/${wxBUILD_FILE_ID}\" \ |
| 84 | \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 85 | )" |
| 86 | ) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 87 | endif() |
| 88 | |
| 89 | -install(EXPORT wxWidgetsTargets NAMESPACE wx:: DESTINATION "lib/cmake/wxWidgets/${wxPLATFORM_LIB_DIR}") |
| 90 | +install(EXPORT wxWidgetsTargets NAMESPACE wx:: DESTINATION "lib${LIB_SUFFIX}/cmake/wxWidgets/${wxPLATFORM_LIB_DIR}") |
| 91 | |
| 92 | # find_package config file |
| 93 | include(CMakePackageConfigHelpers) |
| 94 | @@ -71,11 +71,11 @@ write_basic_package_version_file( |
| 95 | configure_package_config_file( |
| 96 | "${wxSOURCE_DIR}/build/cmake/wxWidgetsConfig.cmake.in" |
| 97 | "${projectConfig}" |
| 98 | - INSTALL_DESTINATION "lib/cmake/wxWidgets" |
| 99 | + INSTALL_DESTINATION "lib${LIB_SUFFIX}/cmake/wxWidgets" |
| 100 | ) |
| 101 | install( |
| 102 | FILES "${projectConfig}" "${versionConfig}" |
| 103 | - DESTINATION "lib/cmake/wxWidgets" |
| 104 | + DESTINATION "lib${LIB_SUFFIX}/cmake/wxWidgets" |
| 105 | ) |
| 106 | |
| 107 | # uninstall target |