Skip to content

Commit

Permalink
COMP: Remove obsolete CTK copy of CMakePackageConfigHelpers
Browse files Browse the repository at this point in the history
This commit is a follow-up of bb46b8c (Add support for install-able and
relocatable package.) where a copy of CMakePackageConfigHelpers was integrated
to support configuring using CMake 2.8.7.

This was needed because the module CMakePackageConfigHelpers was introduced
in CMake 2.8.8.

Since CMake 3.0 is now required to build or use CTK, ths commit removes
the obsolete logic checking if the CTK copy of CMakePackageConfigHelpers
needed to be included.

The change is consistent with configure output:

[...]
-- Including CMake built-in module CMakePackageConfigHelpers
-- Including CMake built-in module CMakePackageConfigHelpers - ok
[...]
  • Loading branch information
jcfr committed Jul 19, 2023
1 parent 27df9fe commit 4c8a68f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 342 deletions.
12 changes: 1 addition & 11 deletions CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,7 @@
# one for installation. The file tells external projects how to use CTK.
#

message(STATUS "Including CMake built-in module CMakePackageConfigHelpers")
include(CMakePackageConfigHelpers OPTIONAL)
if(COMMAND configure_package_config_file)
message(STATUS "Including CMake built-in module CMakePackageConfigHelpers - ok")
else()
message(STATUS "Including CMake built-in module CMakePackageConfigHelpers - failed")
message(STATUS "Including CTK module CMakePackageConfigHelpers")
list(APPEND CMAKE_MODULE_PATH ${CTK_CMAKE_DIR}/configure_package_config_file)
include(CMakePackageConfigHelpers)
message(STATUS "Including CTK module CMakePackageConfigHelpers - ok")
endif()
include(CMakePackageConfigHelpers)

include(ctkFunctionGeneratePluginUseFile)

Expand Down
331 changes: 0 additions & 331 deletions CMake/configure_package_config_file/CMakePackageConfigHelpers.cmake

This file was deleted.

0 comments on commit 4c8a68f

Please sign in to comment.