diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-30 15:51:03 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-05 15:45:26 +0000 |
commit | 1402ebd7ed929568426bccf44c869ca3bf93af16 (patch) | |
tree | d44bf199e9751bce0402959738a4173425dac109 /cmake | |
parent | ffe0e3640a0cfe9175c6e34248674a4249d0c14a (diff) |
CMake: Rewrite double-conversion find module
Rename FindWrapDoubleConversion.cmake into
FindWrapSystemDoubleConversion.cmake.
Merge contents of Finddouble-conversion.cmake into the one above.
This allows users to provide their own Finddouble-conversion.cmake
file (Conan can do it).
Don't mark the system package as required, because we have a bundled
one too.
Add link to upstream.
Make sure to show either Config file or library path when one is
found.
Fixes: QTBUG-104541
Change-Id: I9ea2330697c6fc280328849ca11522291c4073d8
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit a310319a0409c1faa1d2fc83c740e009f46dba84)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/FindWrapDoubleConversion.cmake | 22 | ||||
-rw-r--r-- | cmake/FindWrapSystemDoubleConversion.cmake | 77 | ||||
-rw-r--r-- | cmake/Finddouble-conversion.cmake | 32 |
3 files changed, 77 insertions, 54 deletions
diff --git a/cmake/FindWrapDoubleConversion.cmake b/cmake/FindWrapDoubleConversion.cmake deleted file mode 100644 index 1908467086..0000000000 --- a/cmake/FindWrapDoubleConversion.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# 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 WrapDoubleConversion::WrapDoubleConversion) - set(WrapDoubleConversion_FOUND ON) - return() -endif() - -set(WrapDoubleConversion_FOUND OFF) - -find_package(double-conversion QUIET) -if (double-conversion_FOUND) - include(FeatureSummary) - set_package_properties(double-conversion PROPERTIES TYPE REQUIRED) - add_library(WrapDoubleConversion::WrapDoubleConversion INTERFACE IMPORTED) - target_link_libraries(WrapDoubleConversion::WrapDoubleConversion - INTERFACE double-conversion::double-conversion) - set(WrapDoubleConversion_FOUND ON) - return() -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(WrapDoubleConversion DEFAULT_MSG WrapDoubleConversion_FOUND) diff --git a/cmake/FindWrapSystemDoubleConversion.cmake b/cmake/FindWrapSystemDoubleConversion.cmake new file mode 100644 index 0000000000..164e79ed54 --- /dev/null +++ b/cmake/FindWrapSystemDoubleConversion.cmake @@ -0,0 +1,77 @@ +# 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 WrapSystemDoubleConversion::WrapSystemDoubleConversion) + set(WrapSystemDoubleConversion_FOUND ON) + return() +endif() + +set(WrapSystemDoubleConversion_REQUIRED_VARS "__double_conversion_found") + +# Find either Config package or Find module. +# Upstream can be built either with CMake and then provides a Config file, or with Scons in which +# case there's no Config file. +# A Find module might be provided by a 3rd party, for example Conan might generate a Find module. +find_package(double-conversion ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} QUIET) +set(__double_conversion_target_name "double-conversion::double-conversion") +if(double-conversion_FOUND AND TARGET "${__double_conversion_target_name}") + set(__double_conversion_found TRUE) + # This ensures the Config file is shown in the fphsa message. + if(double-conversion_CONFIG) + list(PREPEND WrapSystemDoubleConversion_REQUIRED_VARS + double-conversion_CONFIG) + endif() +endif() + +if(NOT __double_conversion_found) + list(PREPEND WrapSystemDoubleConversion_REQUIRED_VARS + DOUBLE_CONVERSION_LIBRARY DOUBLE_CONVERSION_INCLUDE_DIR) + + find_path(DOUBLE_CONVERSION_INCLUDE_DIR + NAMES + double-conversion.h + PATH_SUFFIXES + double-conversion + ) + find_library(DOUBLE_CONVERSION_LIBRARY NAMES double-conversion) + include(SelectLibraryConfigurations) + select_library_configurations(DOUBLE_CONVERSION) + mark_as_advanced(DOUBLE_CONVERSION_INCLUDE_DIR DOUBLE_CONVERSION_LIBRARY) + + if(DOUBLE_CONVERSION_LIBRARIES AND DOUBLE_CONVERSION_INCLUDE_DIRS) + set(__double_conversion_found TRUE) + endif() +endif() + +include(FindPackageHandleStandardArgs) + +set(__double_conversion_fphsa_args "") +if(double-conversion_VERSION) + set(WrapSystemDoubleConversion_VERSION "${double-conversion_VERSION}") + list(APPEND __double_conversion_fphsa_args VERSION_VAR WrapSystemDoubleConversion_VERSION) +endif() + +find_package_handle_standard_args(WrapSystemDoubleConversion + REQUIRED_VARS ${WrapSystemDoubleConversion_REQUIRED_VARS} + ${__double_conversion_fphsa_args}) + +if(WrapSystemDoubleConversion_FOUND) + add_library(WrapSystemDoubleConversion::WrapSystemDoubleConversion INTERFACE IMPORTED) + if(TARGET "${__double_conversion_target_name}") + target_link_libraries(WrapSystemDoubleConversion::WrapSystemDoubleConversion + INTERFACE "${__double_conversion_target_name}") + else() + target_link_libraries(WrapSystemDoubleConversion::WrapSystemDoubleConversion + INTERFACE ${DOUBLE_CONVERSION_LIBRARIES}) + target_include_directories(WrapSystemDoubleConversion::WrapSystemDoubleConversion + INTERFACE ${DOUBLE_CONVERSION_INCLUDE_DIRS}) + endif() +endif() +unset(__double_conversion_target_name) +unset(__double_conversion_found) +unset(__double_conversion_fphsa_args) + +include(FeatureSummary) +set_package_properties(WrapSystemDoubleConversion PROPERTIES + URL "https://github.com/google/double-conversion" + DESCRIPTION "double-conversion library") + diff --git a/cmake/Finddouble-conversion.cmake b/cmake/Finddouble-conversion.cmake deleted file mode 100644 index 43d2076289..0000000000 --- a/cmake/Finddouble-conversion.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# Fallback find module for double-conversion -# if double-conversion is built with CMake it'll install a config module, which we prefer -# if it's built with Scons (their default), we search ourselves - -find_package(double-conversion CONFIG) -if (double-conversion_FOUND) - if(TARGET double-conversion::double-conversion) - return() - endif() -endif() - -find_path(DOUBLE_CONVERSION_INCLUDE_DIR - NAMES - double-conversion.h - PATH_SUFFIXES - double-conversion -) -find_library(DOUBLE_CONVERSION_LIBRARY NAMES double-conversion) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - double-conversion DEFAULT_MSG - DOUBLE_CONVERSION_LIBRARY DOUBLE_CONVERSION_INCLUDE_DIR) - -if(double-conversion_FOUND AND NOT TARGET double-conversion::double-conversion) - add_library(double-conversion::double-conversion UNKNOWN IMPORTED) - set_target_properties(double-conversion::double-conversion PROPERTIES - IMPORTED_LOCATION "${DOUBLE_CONVERSION_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${DOUBLE_CONVERSION_INCLUDE_DIR}") -endif() - -mark_as_advanced(DOUBLE_CONVERSION_INCLUDE_DIR DOUBLE_CONVERSION_LIBRARY) |