Skip to content

Commit 77e2aca

Browse files
committed
cmake 3.14
new location for CPackRPM.cmake
1 parent 0e56eba commit 77e2aca

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ ENDIF()
3737

3838
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
3939

40-
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
40+
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
41+
${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
4142

4243
# Use a default manufacturer if no manufacturer was identified.
4344
IF(NOT DEFINED MANUFACTURER)

cmake/CPackRPM.cmake renamed to cmake/Internal/CPack/CPackRPM.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ endif()
5050
# load the original CPackRPM.cmake
5151
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
5252
unset(CMAKE_MODULE_PATH)
53-
include(CPackRPM)
53+
if (CMAKE_VERSION VERSION_GREATER "3.12.99")
54+
include(Internal/CPack/CPackRPM)
55+
else()
56+
include(CPackRPM)
57+
endif()
5458
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
5559

5660
restore(LICENSE)

0 commit comments

Comments
 (0)