From 7db6ff48634aba901a179329b0cfff7bbab1c6be Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 23 Aug 2025 11:48:36 +0200 Subject: [PATCH] CMake: Include CPackIFWConfigureFile normally As minimum CMake version required to build CMake itself is set to 3.13, including this module from the source directory isn't needed anymore, as it was added in CMake 3.8. This also enables changing module code as done in other modules - not dependent on CMake build system itself. --- CMakeCPack.cmake | 2 +- Modules/CPackIFWConfigureFile.cmake | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index 3ac6030318..f305d8b307 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -52,7 +52,7 @@ if(NOT DEFINED CPACK_SYSTEM_NAME) endif() # Command for configure IFW script templates -include(${CMake_SOURCE_DIR}/Modules/CPackIFWConfigureFile.cmake) +include(CPackIFWConfigureFile) # Advanced IFW configuration set(_cpifwrc CPACK_IFW_COMPONENT_GROUP_CMAKE_) diff --git a/Modules/CPackIFWConfigureFile.cmake b/Modules/CPackIFWConfigureFile.cmake index f8ddd51b6b..f92fc108d2 100644 --- a/Modules/CPackIFWConfigureFile.cmake +++ b/Modules/CPackIFWConfigureFile.cmake @@ -36,10 +36,6 @@ The module defines the following commands: #]=======================================================================] -# NOTE: This file used to himself packaging via CPack IFW generator and -# should be compatible with minimal CMake version defined in -# ../CMakeLists.txt file. - if(NOT DEFINED CPackIFWConfigureFile_CMake_INCLUDED) set(CPackIFWConfigureFile_CMake_INCLUDED 1)