diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-02 19:44:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-02 19:44:08 (GMT) |
| commit | 6cff2afc8bfb38bae989be41ab2451e5577c34a1 (patch) | |
| tree | d58ffc8229a6f1207ea8dd4fc6bee161a5da95a3 /Modules | |
| parent | 85704c04c0d05c7e390ddccfc78493811a319f7e (diff) | |
| parent | 98b9f52bc90e96618445785bfd6af777b9dc11bc (diff) | |
| download | CMake-6cff2afc8bfb38bae989be41ab2451e5577c34a1.zip CMake-6cff2afc8bfb38bae989be41ab2451e5577c34a1.tar.gz CMake-6cff2afc8bfb38bae989be41ab2451e5577c34a1.tar.bz2 | |
Merge topic 'export-EXPORT-subcommand'
98b9f52 Help: Document export(EXPORT) in the cmake-packages manual.
a1d2bda Don't copy find_dependency in configure_package_config_file.
f4f6529 Help: cmake-packages: Add missing slash.
cbe7e8f export: Implement EXPORT subcommand (#9822)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakePackageConfigHelpers.cmake | 11 |
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} ####################################################################################") |