feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix cmake build

Browse Source 
Amends 88781a003f.

Change-Id: I37aa5c3fbf6490a186deacae257858d3ceb817d1
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Christian Stenger
2022-04-29 12:13:53 +02:00
parent 7826012443
commit 07195cea8b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindQt5.cmake
View File

@@ -61,13 +61,13 @@ set(__additional_imported_components ATSPI2_nolink) # Work around QTBUG-97023
foreach(comp IN LISTS Qt5_FIND_COMPONENTS __additional_imported_components) foreach(comp IN LISTS Qt5_FIND_COMPONENTS __additional_imported_components)
if(TARGET Qt6::${comp}) if(TARGET Qt6::${comp})
if (NOT TARGET Qt5::${comp}) if (NOT TARGET Qt5::${comp})
if (QT_BUILD_SHARED_LIBS) if (NOT QT_FEATURE_static)
set_property(TARGET Qt6::${comp} PROPERTY IMPORTED_GLOBAL TRUE) set_property(TARGET Qt6::${comp} PROPERTY IMPORTED_GLOBAL TRUE)
endif() endif()
add_library(Qt5::${comp} ALIAS Qt6::${comp}) add_library(Qt5::${comp} ALIAS Qt6::${comp})
endif() endif()
if (TARGET Qt6::${comp}Private AND NOT TARGET Qt5::${comp}Private) if (TARGET Qt6::${comp}Private AND NOT TARGET Qt5::${comp}Private)
if (QT_BUILD_SHARED_LIBS) if (NOT QT_FEATURE_static)
set_property(TARGET Qt6::${comp}Private PROPERTY IMPORTED_GLOBAL TRUE) set_property(TARGET Qt6::${comp}Private PROPERTY IMPORTED_GLOBAL TRUE)
endif() endif()
add_library(Qt5::${comp}Private ALIAS Qt6::${comp}Private) add_library(Qt5::${comp}Private ALIAS Qt6::${comp}Private)