summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-26 18:32:53 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-26 22:14:48 +0200
commitb0772b41c26dc9e628df520f4e63ac9742ba88b2 (patch)
treee8f4244628cf6dd0ca4d1ebf390b1cef6138fba3
parentfb5cf5be15781be42f7aca21829937b28b98e955 (diff)
CMake: Display found information in some of the Find modules
Change-Id: I5d92f2f1a552888361a2939577c2b0177c62b596 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--cmake/FindDB2.cmake2
-rw-r--r--cmake/FindOracle.cmake2
-rw-r--r--cmake/FindWrapAtomic.cmake3
-rw-r--r--cmake/FindWrapDBus1.cmake3
-rw-r--r--cmake/FindWrapDoubleConversion.cmake3
-rw-r--r--cmake/FindWrapRt.cmake3
-rw-r--r--cmake/FindWrapSystemFreetype.cmake2
-rw-r--r--cmake/FindWrapSystemHarfbuzz.cmake3
-rw-r--r--cmake/FindWrapSystemPCRE2.cmake3
-rw-r--r--cmake/FindWrapSystemPNG.cmake2
-rw-r--r--cmake/QtFindWrapHelper.cmake5
11 files changed, 31 insertions, 0 deletions
diff --git a/cmake/FindDB2.cmake b/cmake/FindDB2.cmake
index 59eadab7d5..f2decb6809 100644
--- a/cmake/FindDB2.cmake
+++ b/cmake/FindDB2.cmake
@@ -57,3 +57,5 @@ set_package_properties(DB2 PROPERTIES
URL "https://www.ibm.com"
DESCRIPTION "IBM DB2 client library")
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DB2 DEFAULT_MSG DB2_INCLUDE_DIRS DB2_LIBRARIES)
diff --git a/cmake/FindOracle.cmake b/cmake/FindOracle.cmake
index 58e787e362..b294f1793e 100644
--- a/cmake/FindOracle.cmake
+++ b/cmake/FindOracle.cmake
@@ -46,3 +46,5 @@ set_package_properties(Oracle PROPERTIES
URL "https://www.oracle.com"
DESCRIPTION "Oracle client library")
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Oracle DEFAULT_MSG Oracle_INCLUDE_DIRS Oracle_LIBRARIES)
diff --git a/cmake/FindWrapAtomic.cmake b/cmake/FindWrapAtomic.cmake
index c65ee1da06..56aa7323bf 100644
--- a/cmake/FindWrapAtomic.cmake
+++ b/cmake/FindWrapAtomic.cmake
@@ -42,3 +42,6 @@ if(HAVE_STDATOMIC_WITH_LIB)
endif()
set(WrapAtomic_FOUND 1)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapAtomic DEFAULT_MSG WrapAtomic_FOUND)
diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
index d4581ee04e..ee856e1de5 100644
--- a/cmake/FindWrapDBus1.cmake
+++ b/cmake/FindWrapDBus1.cmake
@@ -40,3 +40,6 @@ endif()
if(DBus1_FOUND)
set(WrapDBus1_FOUND 1)
endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapDBus1 DEFAULT_MSG WrapDBus1_FOUND)
diff --git a/cmake/FindWrapDoubleConversion.cmake b/cmake/FindWrapDoubleConversion.cmake
index cc0d54ac9f..1908467086 100644
--- a/cmake/FindWrapDoubleConversion.cmake
+++ b/cmake/FindWrapDoubleConversion.cmake
@@ -17,3 +17,6 @@ if (double-conversion_FOUND)
set(WrapDoubleConversion_FOUND ON)
return()
endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapDoubleConversion DEFAULT_MSG WrapDoubleConversion_FOUND)
diff --git a/cmake/FindWrapRt.cmake b/cmake/FindWrapRt.cmake
index 6a138d348f..98acf2c0f3 100644
--- a/cmake/FindWrapRt.cmake
+++ b/cmake/FindWrapRt.cmake
@@ -35,3 +35,6 @@ if(HAVE_GETTIME)
target_link_libraries(WrapRt::WrapRt INTERFACE "${LIBRT}")
endif()
endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapRt DEFAULT_MSG WrapRt_FOUND)
diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
index 22020d0a89..41c669b973 100644
--- a/cmake/FindWrapSystemFreetype.cmake
+++ b/cmake/FindWrapSystemFreetype.cmake
@@ -33,3 +33,5 @@ if(Freetype_FOUND)
endforeach()
endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapSystemFreetype DEFAULT_MSG WrapSystemFreetype_FOUND)
diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
index a8dc6a14e6..087c1b070b 100644
--- a/cmake/FindWrapSystemHarfbuzz.cmake
+++ b/cmake/FindWrapSystemHarfbuzz.cmake
@@ -43,3 +43,6 @@ endif()
unset(__harfbuzz_target_name)
unset(__harfbuzz_include_dir)
unset(__harfbuzz_broken_config_file)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapSystemHarfbuzz DEFAULT_MSG WrapSystemHarfbuzz_FOUND)
diff --git a/cmake/FindWrapSystemPCRE2.cmake b/cmake/FindWrapSystemPCRE2.cmake
index 31379ecc63..32966c2e30 100644
--- a/cmake/FindWrapSystemPCRE2.cmake
+++ b/cmake/FindWrapSystemPCRE2.cmake
@@ -21,3 +21,6 @@ else()
set(WrapSystemPCRE2_FOUND TRUE)
endif()
endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapSystemPCRE2 DEFAULT_MSG WrapSystemPCRE2_FOUND)
diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
index cff160ad04..dc42c731fb 100644
--- a/cmake/FindWrapSystemPNG.cmake
+++ b/cmake/FindWrapSystemPNG.cmake
@@ -25,3 +25,5 @@ if(PNG_FOUND)
endforeach()
endif()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WrapSystemPNG DEFAULT_MSG WrapSystemPNG_FOUND)
diff --git a/cmake/QtFindWrapHelper.cmake b/cmake/QtFindWrapHelper.cmake
index f536df99e1..beafad9ab3 100644
--- a/cmake/QtFindWrapHelper.cmake
+++ b/cmake/QtFindWrapHelper.cmake
@@ -76,6 +76,11 @@ macro(qt_find_package_system_or_bundled _unique_prefix)
set_target_properties("${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_TARGET}" PROPERTIES
INTERFACE_QT_3RD_PARTY_PACKAGE_TYPE
"${${_unique_prefix}_qt_package_type}")
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(
+ Wrap${_qfwrap_${_unique_prefix}_FRIENDLY_PACKAGE_NAME}
+ DEFAULT_MSG ${_qfwrap_${_unique_prefix}_WRAP_PACKAGE_FOUND_VAR_NAME})
elseif(${_unique_prefix}_qt_package_type STREQUAL "bundled")
message(FATAL_ERROR "Can't find ${${_unique_prefix}_qt_package_target_to_use}.")
endif()