diff options
Diffstat (limited to '0001-Use-CMake-s-default-import-library-suffix.patch')
| -rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch index 20ec68ea2949..6a1f3aeaa10a 100644 --- a/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,4 +1,4 @@ -From 698e2140cf864ae445abd9e2f280b1f1628eb648 Mon Sep 17 00:00:00 2001 +From df9364458a82e26c51c37e8f3cad6a2ca6b828a3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 1/8] Use CMake's default import library suffix @@ -13,10 +13,10 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index abe03031ad..1c36697ed0 100644 +index 5498b8a904..59c905eac2 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake -@@ -372,9 +372,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features +@@ -370,9 +370,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}") @@ -30,8 +30,8 @@ index abe03031ad..1c36697ed0 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) - if(MSVC) -@@ -785,9 +789,13 @@ CONFIG += ${private_config_joined} + add_custom_command( +@@ -777,9 +781,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -45,9 +45,9 @@ index abe03031ad..1c36697ed0 100644 + ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX} ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) - if(MSVC) + add_custom_command( diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 9e830827a0..2da463dc2d 100644 +index 0aab301053..f2e39b63e0 100644 --- a/cmake/QtPrlHelpers.cmake +++ b/cmake/QtPrlHelpers.cmake @@ -348,11 +348,17 @@ ${prl_step1_content_libs} @@ -110,5 +110,5 @@ index fc4c745c90..939ea2b212 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.32.0 +2.33.0 |