Commit 77e2aca3 authored by Sergei Golubchik's avatar Sergei Golubchik

cmake 3.14

new location for CPackRPM.cmake
parent 0e56eba9
...@@ -37,7 +37,8 @@ ENDIF() ...@@ -37,7 +37,8 @@ ENDIF()
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
# Use a default manufacturer if no manufacturer was identified. # Use a default manufacturer if no manufacturer was identified.
IF(NOT DEFINED MANUFACTURER) IF(NOT DEFINED MANUFACTURER)
......
...@@ -50,7 +50,11 @@ endif() ...@@ -50,7 +50,11 @@ endif()
# load the original CPackRPM.cmake # load the original CPackRPM.cmake
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
unset(CMAKE_MODULE_PATH) unset(CMAKE_MODULE_PATH)
include(CPackRPM) if (CMAKE_VERSION VERSION_GREATER "3.12.99")
include(Internal/CPack/CPackRPM)
else()
include(CPackRPM)
endif()
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
restore(LICENSE) restore(LICENSE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment