소스 검색

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.
Peter Kokot 1 개월 전
부모
커밋
7db6ff4863
2개의 변경된 파일1개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      CMakeCPack.cmake
  2. 0 4
      Modules/CPackIFWConfigureFile.cmake

+ 1 - 1
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_)

+ 0 - 4
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)