From 63d0ec14de223a800910a22864aa8083b1a3f610 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 23 Mar 2019 11:27:30 +0100
Subject: [PATCH] cmake 3.14

---
 CMakeLists.txt                            | 3 ++-
 cmake/{ => Internal/CPack}/CPackRPM.cmake | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename cmake/{ => Internal/CPack}/CPackRPM.cmake (98%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93392056cf54c..73263535240a0 100644
--- a/CMakeLists.txt
+++ b/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) 
diff --git a/cmake/CPackRPM.cmake b/cmake/Internal/CPack/CPackRPM.cmake
similarity index 98%
rename from cmake/CPackRPM.cmake
rename to cmake/Internal/CPack/CPackRPM.cmake
index 326013f06b3d4..8da0079a7467f 100644
--- a/cmake/CPackRPM.cmake
+++ b/cmake/Internal/CPack/CPackRPM.cmake
@@ -50,7 +50,7 @@ endif()
 # load the original CPackRPM.cmake
 set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
 unset(CMAKE_MODULE_PATH)
-include(CPackRPM)
+include(Internal/CPack/CPackRPM)
 set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
 
 restore(LICENSE)