diff options
-rw-r--r-- | cmake/FindSlog2.cmake | 8 | ||||
-rw-r--r-- | cmake/FindWrapAtomic.cmake (renamed from cmake/FindAtomic.cmake) | 10 | ||||
-rw-r--r-- | cmake/FindWrapRt.cmake | 6 | ||||
-rw-r--r-- | src/corelib/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/corelib/configure.cmake | 8 | ||||
-rw-r--r-- | util/cmake/helper.py | 4 |
6 files changed, 19 insertions, 21 deletions
diff --git a/cmake/FindSlog2.cmake b/cmake/FindSlog2.cmake index dfb6635a39..807ab6b12a 100644 --- a/cmake/FindSlog2.cmake +++ b/cmake/FindSlog2.cmake @@ -11,9 +11,7 @@ find_package_handle_standard_args(Slog2 DEFAULT_MSG Slog2_INCLUDE_DIR Slog2_LIBR mark_as_advanced(Slog2_INCLUDE_DIR Slog2_LIBRARY) if(Slog2_FOUND) - add_library(__Slog2 INTERFACE IMPORTED) - target_link_libraries(__Slog2 INTERFACE ${Slog2_LIBRARY}) - target_include_directories(__Slog2 INTERFACE ${Slog2_INCLUDE_DIR}) - - add_library(Slog2::Slog2 ALIAS __Slog2) + add_library(Slog2::Slog2 INTERFACE IMPORTED) + target_link_libraries(Slog2::Slog2 INTERFACE ${Slog2_LIBRARY}) + target_include_directories(Slog2::Slog2 INTERFACE ${Slog2_INCLUDE_DIR}) endif() diff --git a/cmake/FindAtomic.cmake b/cmake/FindWrapAtomic.cmake index 91cee62046..c65ee1da06 100644 --- a/cmake/FindAtomic.cmake +++ b/cmake/FindWrapAtomic.cmake @@ -1,7 +1,7 @@ # We can't create the same interface imported target multiple times, CMake will complain if we do # that. This can happen if the find_package call is done in multiple different subdirectories. -if(TARGET Atomic) - set(Atomic_FOUND ON) +if(TARGET WrapAtomic::WrapAtomic) + set(WrapAtomic_FOUND ON) return() endif() @@ -36,9 +36,9 @@ if(NOT HAVE_STDATOMIC) set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}") endif() -add_library(Atomic INTERFACE IMPORTED) +add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED) if(HAVE_STDATOMIC_WITH_LIB) - target_link_libraries(Atomic INTERFACE atomic) + target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic) endif() -set(Atomic_FOUND 1) +set(WrapAtomic_FOUND 1) diff --git a/cmake/FindWrapRt.cmake b/cmake/FindWrapRt.cmake index 0e57cadef5..6a138d348f 100644 --- a/cmake/FindWrapRt.cmake +++ b/cmake/FindWrapRt.cmake @@ -1,6 +1,6 @@ # We can't create the same interface imported target multiple times, CMake will complain if we do # that. This can happen if the find_package call is done in multiple different subdirectories. -if(TARGET WrapRt) +if(TARGET WrapRt::WrapRt) set(WrapRt_FOUND ON) return() endif() @@ -30,8 +30,8 @@ cmake_pop_check_state() if(HAVE_GETTIME) set(WrapRt_FOUND ON) - add_library(WrapRt INTERFACE IMPORTED) + add_library(WrapRt::WrapRt INTERFACE IMPORTED) if (LIBRT_FOUND) - target_link_libraries(WrapRt INTERFACE "${LIBRT}") + target_link_libraries(WrapRt::WrapRt INTERFACE "${LIBRT}") endif() endif() 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" diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 92410e8e99..10dfa1d5fc 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -440,14 +440,14 @@ _library_map = [ ), LibraryMapping("journald", "Libsystemd", "PkgConfig::Libsystemd"), LibraryMapping("jpeg", "JPEG", "JPEG::JPEG"), # see also libjpeg - LibraryMapping("libatomic", "Atomic", "Atomic"), + LibraryMapping("libatomic", "WrapAtomic", "WrapAtomic::WrapAtomic"), LibraryMapping("libclang", "WrapLibClang", "WrapLibClang::WrapLibClang"), LibraryMapping("libdl", None, "${CMAKE_DL_LIBS}"), LibraryMapping("libinput", "Libinput", "Libinput::Libinput"), LibraryMapping("libjpeg", "JPEG", "JPEG::JPEG"), # see also jpeg LibraryMapping("libpng", "WrapPNG", "WrapPNG::WrapPNG", is_bundled_with_qt=True), LibraryMapping("libproxy", "Libproxy", "PkgConfig::Libproxy"), - LibraryMapping("librt", "WrapRt", "WrapRt"), + LibraryMapping("librt", "WrapRt", "WrapRt::WrapRt"), LibraryMapping("libudev", "Libudev", "PkgConfig::Libudev"), LibraryMapping("lttng-ust", "LTTngUST", "LTTng::UST", resultVariable="LTTNGUST"), LibraryMapping("mtdev", "Mtdev", "PkgConfig::Mtdev"), |