Browse Source

cmake 3.14

new location for CPackRPM.cmake
pull/1141/head mariadb-10.2.23
Sergei Golubchik 7 years ago
parent
commit
77e2aca3f0
  1. 3
      CMakeLists.txt
  2. 6
      cmake/Internal/CPack/CPackRPM.cmake

3
CMakeLists.txt

@ -37,7 +37,8 @@ ENDIF()
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.
IF(NOT DEFINED MANUFACTURER)

6
cmake/CPackRPM.cmake → cmake/Internal/CPack/CPackRPM.cmake

@ -50,7 +50,11 @@ endif()
# load the original CPackRPM.cmake
set(orig_CMAKE_MODULE_PATH ${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})
restore(LICENSE)
Loading…
Cancel
Save