summaryrefslogtreecommitdiffstats
path: root/Modules/CMakePackageConfigHelpers.cmake
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-12-24 00:15:42 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-12-24 12:02:49 (GMT)
commita1d2bda23e9fb2bc463b3ff5b57f1f88edfd40ca (patch)
tree03b5075832b842acc3260fe9f88093f64fbf9996 /Modules/CMakePackageConfigHelpers.cmake
parentf4f6529354a2e551626fb77e22624cf180baa9b0 (diff)
downloadCMake-a1d2bda23e9fb2bc463b3ff5b57f1f88edfd40ca.zip
CMake-a1d2bda23e9fb2bc463b3ff5b57f1f88edfd40ca.tar.gz
CMake-a1d2bda23e9fb2bc463b3ff5b57f1f88edfd40ca.tar.bz2
Don't copy find_dependency in configure_package_config_file.
There is not really any need to. Downstreams can either rely on it being provided by CMake, or copy and distribute it. Change the documented include for the find_dependency macro.
Diffstat (limited to 'Modules/CMakePackageConfigHelpers.cmake')
-rw-r--r--Modules/CMakePackageConfigHelpers.cmake11
1 files changed, 2 insertions, 9 deletions
diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 2c1c613..f388fe0 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -11,8 +11,7 @@
# CONFIGURE_PACKAGE_CONFIG_FILE(<input> <output> INSTALL_DESTINATION <path>
# [PATH_VARS <var1> <var2> ... <varN>]
# [NO_SET_AND_CHECK_MACRO]
-# [NO_CHECK_REQUIRED_COMPONENTS_MACRO]
-# [NO_FIND_DEPENDENCY_MACRO])
+# [NO_CHECK_REQUIRED_COMPONENTS_MACRO])
#
#
#
@@ -196,7 +195,6 @@
include(CMakeParseArguments)
include(WriteBasicConfigVersionFile)
-include(CMakeFindDependencyMacro)
macro(WRITE_BASIC_PACKAGE_VERSION_FILE)
write_basic_config_version_file(${ARGN})
@@ -205,7 +203,7 @@ endmacro()
set(cfpch_dir ${CMAKE_CURRENT_LIST_DIR})
function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
- set(options NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO NO_FIND_DEPENDENCY_MACRO)
+ set(options NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
set(oneValueArgs INSTALL_DESTINATION )
set(multiValueArgs PATH_VARS )
@@ -291,11 +289,6 @@ endmacro()
")
endif()
- if(NOT CCF_NO_FIND_DEPENDENCY_MACRO)
- file(READ "${cfpch_dir}/CMakeFindDependencyMacro.cmake" find_dependency_macro)
- set(PACKAGE_INIT "${PACKAGE_INIT} ${find_dependency_macro}")
- endif()
-
set(PACKAGE_INIT "${PACKAGE_INIT}
####################################################################################")