1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Namespace all our IMPORTED targets

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-04-28 17:33:29 +02:00
parent 317cfb6774
commit 062b50abff
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/FindSlog2.cmake
View File

@ -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) mark_as_advanced(Slog2_INCLUDE_DIR Slog2_LIBRARY)
if(Slog2_FOUND) if(Slog2_FOUND)
add_library(__Slog2 INTERFACE IMPORTED) add_library(Slog2::Slog2 INTERFACE IMPORTED)
target_link_libraries(__Slog2 INTERFACE ${Slog2_LIBRARY}) target_link_libraries(Slog2::Slog2 INTERFACE ${Slog2_LIBRARY})
target_include_directories(__Slog2 INTERFACE ${Slog2_INCLUDE_DIR}) target_include_directories(Slog2::Slog2 INTERFACE ${Slog2_INCLUDE_DIR})
add_library(Slog2::Slog2 ALIAS __Slog2)
endif() endif()

10
cmake/FindAtomic.cmake → cmake/FindWrapAtomic.cmake
View File

@ -1,7 +1,7 @@
# We can't create the same interface imported target multiple times, CMake will complain if we do # 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. # that. This can happen if the find_package call is done in multiple different subdirectories.
if(TARGET Atomic) if(TARGET WrapAtomic::WrapAtomic)
set(Atomic_FOUND ON) set(WrapAtomic_FOUND ON)
return() return()
endif() endif()
@ -36,9 +36,9 @@ if(NOT HAVE_STDATOMIC)
set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}") set(CMAKE_REQUIRE_LIBRARIES "${_req_libraries}")
endif() endif()
add_library(Atomic INTERFACE IMPORTED) add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
if(HAVE_STDATOMIC_WITH_LIB) if(HAVE_STDATOMIC_WITH_LIB)
target_link_libraries(Atomic INTERFACE atomic) target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
endif() endif()
set(Atomic_FOUND 1) set(WrapAtomic_FOUND 1)

6
cmake/FindWrapRt.cmake
View File

@ -1,6 +1,6 @@
# We can't create the same interface imported target multiple times, CMake will complain if we do # 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. # 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) set(WrapRt_FOUND ON)
return() return()
endif() endif()
@ -30,8 +30,8 @@ cmake_pop_check_state()
if(HAVE_GETTIME) if(HAVE_GETTIME)
set(WrapRt_FOUND ON) set(WrapRt_FOUND ON)
add_library(WrapRt INTERFACE IMPORTED) add_library(WrapRt::WrapRt INTERFACE IMPORTED)
if (LIBRT_FOUND) if (LIBRT_FOUND)
target_link_libraries(WrapRt INTERFACE "${LIBRT}") target_link_libraries(WrapRt::WrapRt INTERFACE "${LIBRT}")
endif() endif()
endif() endif()

4
src/corelib/CMakeLists.txt
View File

@ -671,7 +671,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_future
qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64 qt_extend_target(Core CONDITION QT_FEATURE_std_atomic64
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Atomic WrapAtomic::WrapAtomic
) )
qt_extend_target(Core CONDITION ICC 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 qt_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
LIBRARIES LIBRARIES
WrapRt WrapRt::WrapRt
) )
qt_extend_target(Core CONDITION UNIX AND NOT ANDROID qt_extend_target(Core CONDITION UNIX AND NOT ANDROID

8
src/corelib/configure.cmake
View File

@ -18,8 +18,8 @@ qt_find_package(WrapDoubleConversion PROVIDED_TARGETS WrapDoubleConversion::Wrap
qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2) 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(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data)
qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd) qt_find_package(Libsystemd PROVIDED_TARGETS PkgConfig::Libsystemd)
qt_find_package(Atomic PROVIDED_TARGETS Atomic) qt_find_package(WrapAtomic PROVIDED_TARGETS WrapAtomic::WrapAtomic)
qt_find_package(WrapRt PROVIDED_TARGETS WrapRt) qt_find_package(WrapRt PROVIDED_TARGETS WrapRt::WrapRt)
qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST) qt_find_package(LTTngUST PROVIDED_TARGETS LTTng::UST)
qt_find_package(WrapSystemPCRE2 PROVIDED_TARGETS WrapSystemPCRE2::WrapSystemPCRE2) qt_find_package(WrapSystemPCRE2 PROVIDED_TARGETS WrapSystemPCRE2::WrapSystemPCRE2)
set_package_properties(WrapPCRE2 PROPERTIES TYPE REQUIRED) set_package_properties(WrapPCRE2 PROPERTIES TYPE REQUIRED)
@ -65,7 +65,7 @@ test(fptr);
qt_config_compile_test(clock_monotonic qt_config_compile_test(clock_monotonic
LABEL "POSIX monotonic clock" LABEL "POSIX monotonic clock"
LIBRARIES LIBRARIES
WrapRt WrapRt::WrapRt
CODE CODE
" "
#include <unistd.h> #include <unistd.h>
@ -640,7 +640,7 @@ qt_feature("linkat" PRIVATE
) )
qt_feature("std-atomic64" PUBLIC qt_feature("std-atomic64" PUBLIC
LABEL "64 bit atomic operations" LABEL "64 bit atomic operations"
CONDITION Atomic_FOUND CONDITION WrapAtomic_FOUND
) )
qt_feature("mimetype" PUBLIC qt_feature("mimetype" PUBLIC
SECTION "Utilities" SECTION "Utilities"

4
util/cmake/helper.py
View File

@ -440,14 +440,14 @@ _library_map = [
), ),
LibraryMapping("journald", "Libsystemd", "PkgConfig::Libsystemd"), LibraryMapping("journald", "Libsystemd", "PkgConfig::Libsystemd"),
LibraryMapping("jpeg", "JPEG", "JPEG::JPEG"), # see also libjpeg LibraryMapping("jpeg", "JPEG", "JPEG::JPEG"), # see also libjpeg
LibraryMapping("libatomic", "Atomic", "Atomic"), LibraryMapping("libatomic", "WrapAtomic", "WrapAtomic::WrapAtomic"),
LibraryMapping("libclang", "WrapLibClang", "WrapLibClang::WrapLibClang"), LibraryMapping("libclang", "WrapLibClang", "WrapLibClang::WrapLibClang"),
LibraryMapping("libdl", None, "${CMAKE_DL_LIBS}"), LibraryMapping("libdl", None, "${CMAKE_DL_LIBS}"),
LibraryMapping("libinput", "Libinput", "Libinput::Libinput"), LibraryMapping("libinput", "Libinput", "Libinput::Libinput"),
LibraryMapping("libjpeg", "JPEG", "JPEG::JPEG"), # see also jpeg LibraryMapping("libjpeg", "JPEG", "JPEG::JPEG"), # see also jpeg
LibraryMapping("libpng", "WrapPNG", "WrapPNG::WrapPNG", is_bundled_with_qt=True), LibraryMapping("libpng", "WrapPNG", "WrapPNG::WrapPNG", is_bundled_with_qt=True),
LibraryMapping("libproxy", "Libproxy", "PkgConfig::Libproxy"), LibraryMapping("libproxy", "Libproxy", "PkgConfig::Libproxy"),
LibraryMapping("librt", "WrapRt", "WrapRt"), LibraryMapping("librt", "WrapRt", "WrapRt::WrapRt"),
LibraryMapping("libudev", "Libudev", "PkgConfig::Libudev"), LibraryMapping("libudev", "Libudev", "PkgConfig::Libudev"),
LibraryMapping("lttng-ust", "LTTngUST", "LTTng::UST", resultVariable="LTTNGUST"), LibraryMapping("lttng-ust", "LTTngUST", "LTTng::UST", resultVariable="LTTNGUST"),
LibraryMapping("mtdev", "Mtdev", "PkgConfig::Mtdev"), LibraryMapping("mtdev", "Mtdev", "PkgConfig::Mtdev"),