diff options
| author | Martchus | 2020-11-07 22:32:24 +0100 |
|---|---|---|
| committer | Martchus | 2020-11-07 22:32:24 +0100 |
| commit | 6f79193e004470e3251ccc6cb70d50995dfaacb5 (patch) | |
| tree | 4c3d8fccdf93f0aa53cc66037f79d8fc53c4dd9b /0001-Use-CMake-s-default-import-library-suffix.patch | |
| parent | d5fc9b0d53496e209bc12bd0f547f62abdb213a7 (diff) | |
| download | aur-6f79193e004470e3251ccc6cb70d50995dfaacb5.tar.gz | |
Update to beta3
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index 77356be11aee..e00b80b2fc55 100644 --- a/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,24 +1,39 @@ -From b067b34ebd6238a6b4c3c0f9d56e88ef169ef53e Mon Sep 17 00:00:00 2001 +From 8073b269bb69ab091bb29600c1f7a493f3543a83 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> -Date: Mon, 14 Sep 2020 20:39:52 +0200 -Subject: [PATCH 1/2] Use CMake's default import library suffix +Date: Thu, 5 Nov 2020 22:08:10 +0100 +Subject: [PATCH 1/5] Use CMake's default import library suffix -Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd +Change-Id: Iedc6a7ee8982a62ddd56ad0bf25ba0b8752a666a --- - cmake/QtPriHelpers.cmake | 8 +++++++- - cmake/QtPrlHelpers.cmake | 8 +++++++- - cmake/QtTargetHelpers.cmake | 2 -- - mkspecs/common/g++-win32.conf | 1 + - mkspecs/features/create_cmake.prf | 5 +++-- - 5 files changed, 18 insertions(+), 6 deletions(-) + cmake/QtPriHelpers.cmake | 12 ++++++++++-- + cmake/QtPrlHelpers.cmake | 8 +++++++- + cmake/QtTargetHelpers.cmake | 2 -- + mkspecs/common/g++-win32.conf | 1 + + mkspecs/features/create_cmake.prf | 5 +++-- + 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index b79f17243e..a689b2b775 100644 +index 56c60b1b18..18e1aeddb1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -292,11 +292,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features - qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") - list(APPEND pri_files "${private_pri_file_path}") +@@ -320,9 +320,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features + qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}") + list(APPEND pri_files "${private_pri_file_path}") + +- set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(library_prefixes ++ ${CMAKE_SHARED_LIBRARY_PREFIX} ++ ${CMAKE_IMPORT_LIBRARY_PREFIX} ++ ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_suffixes + ${CMAKE_SHARED_LIBRARY_SUFFIX} ++ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} + ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} + ${CMAKE_STATIC_LIBRARY_SUFFIX}) + add_custom_command( +@@ -727,9 +731,13 @@ CONFIG += ${private_config_joined} + list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") + endforeach() - set(library_prefixes ${CMAKE_SHARED_LIBRARY_PREFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(library_prefixes @@ -30,13 +45,9 @@ index b79f17243e..a689b2b775 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) -+ list(REMOVE_DUPLICATES library_prefixes) -+ list(REMOVE_DUPLICATES library_suffixes) add_custom_command( - OUTPUT "${private_pri_file_path}" - DEPENDS ${inputs} diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 932565f318..9729c150a4 100644 +index 35d321420c..40a85e6c73 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION} @@ -100,5 +111,5 @@ index 24ed125f12..73ebe453d3 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib -- -2.29.1 +2.29.2 |