AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15117f84bb
qt5base-lts/cmake/FindWrapRt.cmake

41 lines
963 B
CMake
Raw Normal View History

Fix a few of the Wrap modules to protect against double creation of targets. This created issues when trying to build standalone examples. Change-Id: Iaaea2b537793ae25fbf3143cc205574446aa4ad1 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
2019-06-05 12:28:31 +00:00
# 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.
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>
2020-04-28 15:33:29 +00:00
if(TARGET WrapRt::WrapRt)
Fix a few of the Wrap modules to protect against double creation of targets. This created issues when trying to build standalone examples. Change-Id: Iaaea2b537793ae25fbf3143cc205574446aa4ad1 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
2019-06-05 12:28:31 +00:00
set(WrapRt_FOUND ON)
return()
endif()
CMake: Fix FindWrapRt module when it's found multiple times On Windows, when WrapRt is qt_find_pacakge()'d the first time, the result is "not found", whereas a second time it would claim that the package is found. This is due to the WrapRt target being always created even if it has no transitive dependencies, and thus a second search would check only for the existence of the target. Fix the module to only create the target if the relevant library is found. Change-Id: I5c838cbfbafb4029f96da815a0f72e4a8e6716b0 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-24 13:34:15 +00:00
set(WrapRt_FOUND OFF)
CMake: Find librt Change-Id: Ibc39ba7a385146cd0428b78e12a793f0ddbfae91 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-05 13:18:57 +00:00
include(CheckCXXSourceCompiles)
Use CMakePushCheckState Change-Id: I58d779674363a7f7db4a7ea4ca4a9f4a9e271798 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-02-12 15:04:57 +00:00
include(CMakePushCheckState)
CMake: Find librt Change-Id: Ibc39ba7a385146cd0428b78e12a793f0ddbfae91 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-05 13:18:57 +00:00
find_library(LIBRT rt)
Use CMakePushCheckState Change-Id: I58d779674363a7f7db4a7ea4ca4a9f4a9e271798 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-02-12 15:04:57 +00:00
cmake_push_check_state()
CMake: Fix FindWrapRt Actually link to librt to fix detection Change-Id: I819d9b57212fef7f539ef807846e06beb7bd617b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-11 17:45:40 +00:00
if(LIBRT)
CMake: Find librt Change-Id: Ibc39ba7a385146cd0428b78e12a793f0ddbfae91 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-05 13:18:57 +00:00
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBRT}")
endif()
check_cxx_source_compiles("
#include <unistd.h>
#include <time.h>
cmake: avoid unused parameters in cmake tests unused parameters in cmake tests cause the tests to fail when the project is configured with `-Werror,-Wunused-parameter` Change-Id: If3065d008753a7718282dfc6ba0d79d46576cb34 Pick-to: 6.2 6.3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-02-21 12:40:27 +00:00
int main(int, char **) {
CMake: Find librt Change-Id: Ibc39ba7a385146cd0428b78e12a793f0ddbfae91 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-05 13:18:57 +00:00
timespec ts; clock_gettime(CLOCK_REALTIME, &ts);
}" HAVE_GETTIME)
Use CMakePushCheckState Change-Id: I58d779674363a7f7db4a7ea4ca4a9f4a9e271798 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-02-12 15:04:57 +00:00
cmake_pop_check_state()
CMake: Find librt Change-Id: Ibc39ba7a385146cd0428b78e12a793f0ddbfae91 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-05 13:18:57 +00:00
CMake: Fix FindWrapRt module when it's found multiple times On Windows, when WrapRt is qt_find_pacakge()'d the first time, the result is "not found", whereas a second time it would claim that the package is found. This is due to the WrapRt target being always created even if it has no transitive dependencies, and thus a second search would check only for the existence of the target. Fix the module to only create the target if the relevant library is found. Change-Id: I5c838cbfbafb4029f96da815a0f72e4a8e6716b0 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-24 13:34:15 +00:00
if(HAVE_GETTIME)
set(WrapRt_FOUND ON)
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>
2020-04-28 15:33:29 +00:00
add_library(WrapRt::WrapRt INTERFACE IMPORTED)
CMake: Fix FindWrapRt We must use the LIBRT location instead of LIBRT_FOUND which is not set anywhere. I failed to replace this one in my previous patch. Change-Id: I6e2df82c31e29018d99afec1eecfb80a321fddd4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-18 16:53:30 +00:00
if (LIBRT)
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>
2020-04-28 15:33:29 +00:00
target_link_libraries(WrapRt::WrapRt INTERFACE "${LIBRT}")
CMake: Fix FindWrapRt module when it's found multiple times On Windows, when WrapRt is qt_find_pacakge()'d the first time, the result is "not found", whereas a second time it would claim that the package is found. This is due to the WrapRt target being always created even if it has no transitive dependencies, and thus a second search would check only for the existence of the target. Fix the module to only create the target if the relevant library is found. Change-Id: I5c838cbfbafb4029f96da815a0f72e4a8e6716b0 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-24 13:34:15 +00:00
endif()
endif()
CMake: Display found information in some of the Find modules Change-Id: I5d92f2f1a552888361a2939577c2b0177c62b596 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-26 16:32:53 +00:00
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(WrapRt DEFAULT_MSG WrapRt_FOUND)
Reference in New Issue Copy Permalink