diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-28 17:33:29 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-29 23:08:32 +0200 |
| commit | 062b50abff6a3cb2319ade41dddf76caa36f27e3 (patch) | |
| tree | 7a0ec6ab28500b2a84d6edcc240d9bc6a309549d /src | |
| parent | 317cfb677464a9610e4b46971e508b90f59b90f6 (diff) | |
CMake: Namespace all our IMPORTED targets
CMake IMPORTED targets should be namespaced so that CMake knows that
the name refers to a target and not a file.
Use the existing WrapXXX naming scheme where applicable.
Fixes: QTBUG-83773
Change-Id: I5b0b722c811200c56c260c69e76940a625228769
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/corelib/configure.cmake | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 911772faca..f03d694471 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -671,7 +671,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_future qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 PUBLIC_LIBRARIES - Atomic + WrapAtomic::WrapAtomic ) qt_extend_target(Core CONDITION ICC @@ -1070,7 +1070,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_glib AND UNIX qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX LIBRARIES - WrapRt + WrapRt::WrapRt ) qt_extend_target(Core CONDITION UNIX AND NOT ANDROID diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 4622f73c0f..4c36877c32 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -18,8 +18,8 @@ qt_find_package(WrapDoubleConversion PROVIDED_TARGETS WrapDoubleConversion::Wrap qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2) qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data) qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd) -qt_find_package(Atomic PROVIDED_TARGETS Atomic) -qt_find_package(WrapRt PROVIDED_TARGETS WrapRt) +qt_find_package(WrapAtomic PROVIDED_TARGETS WrapAtomic::WrapAtomic) +qt_find_package(WrapRt PROVIDED_TARGETS WrapRt::WrapRt) qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST) qt_find_package(WrapSystemPCRE2 PROVIDED_TARGETS WrapSystemPCRE2::WrapSystemPCRE2) set_package_properties(WrapPCRE2 PROPERTIES TYPE REQUIRED) @@ -65,7 +65,7 @@ test(fptr); qt_config_compile_test(clock_monotonic LABEL "POSIX monotonic clock" LIBRARIES - WrapRt + WrapRt::WrapRt CODE " #include <unistd.h> @@ -640,7 +640,7 @@ qt_feature("linkat" PRIVATE ) qt_feature("std-atomic64" PUBLIC LABEL "64 bit atomic operations" - CONDITION Atomic_FOUND + CONDITION WrapAtomic_FOUND ) qt_feature("mimetype" PUBLIC SECTION "Utilities" |