cmake: do not introduce a policy stack in the package config

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0707fba30ea88b6defdb42d181f2dec071f09f4b..8b491db9d5058183c83bf9316c791c303e37ae9d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -590,7 +590,7 @@ install (TARGETS glog
   LIBRARY DESTINATION ${_glog_CMake_LIBDIR}
   ARCHIVE DESTINATION ${_glog_CMake_LIBDIR})
 
-set (glog_POLICY_VERSION 3.0)
+set (glog_CMake_VERSION 3.0)
 
 if (gflags_FOUND)
   # Ensure clients locate only the package config and not third party find
@@ -600,7 +600,7 @@ if (gflags_FOUND)
   else (CMAKE_VERSION VERSION_LESS 3.9)
     # Passing additional find_package arguments to find_dependency is possible
     # starting with CMake 3.9.
-    set (glog_POLICY_VERSION 3.9)
+    set (glog_CMake_VERSION 3.9)
     set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION} NO_MODULE)")
   endif (CMAKE_VERSION VERSION_LESS 3.9)
 endif (gflags_FOUND)

diff --git a/glog-config.cmake.in b/glog-config.cmake.in
index a586cbb14132ec01c1e6475b7f90413daafa7523..aabdedc3e98d2f9a7165b43c06bf523546e9b29a 100644 (file)
--- a/glog-config.cmake.in
+++ b/glog-config.cmake.in
@@ -1,5 +1,6 @@
-cmake_policy (PUSH)
-cmake_policy (VERSION @glog_POLICY_VERSION@)
+if (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
+  message (FATAL_ERROR "CMake >= @glog_CMake_VERSION@ required")
+endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
 
 @PACKAGE_INIT@
 
@@ -8,5 +9,3 @@ include (CMakeFindDependencyMacro)
 @gflags_DEPENDENCY@
 
 include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake")
-
-cmake_policy (POP)