luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergiu Deitsch 2018-02-23 10:16:24 +01:00
parent 4c4631c9b3
commit 1aec14edf4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -590,7 +590,7 @@ install (TARGETS glog
LIBRARY DESTINATION ${_glog_CMake_LIBDIR} LIBRARY DESTINATION ${_glog_CMake_LIBDIR}
ARCHIVE DESTINATION ${_glog_CMake_LIBDIR}) ARCHIVE DESTINATION ${_glog_CMake_LIBDIR})
set (glog_POLICY_VERSION 3.0) set (glog_CMake_VERSION 3.0)
if (gflags_FOUND) if (gflags_FOUND)
# Ensure clients locate only the package config and not third party find # 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) else (CMAKE_VERSION VERSION_LESS 3.9)
# Passing additional find_package arguments to find_dependency is possible # Passing additional find_package arguments to find_dependency is possible
# starting with CMake 3.9. # 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)") set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION} NO_MODULE)")
endif (CMAKE_VERSION VERSION_LESS 3.9) endif (CMAKE_VERSION VERSION_LESS 3.9)
endif (gflags_FOUND) endif (gflags_FOUND)

7
glog-config.cmake.in
View File

@ -1,5 +1,6 @@
cmake_policy (PUSH) if (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
cmake_policy (VERSION @glog_POLICY_VERSION@) message (FATAL_ERROR "CMake >= @glog_CMake_VERSION@ required")
endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
@PACKAGE_INIT@ @PACKAGE_INIT@
@ -8,5 +9,3 @@ include (CMakeFindDependencyMacro)
@gflags_DEPENDENCY@ @gflags_DEPENDENCY@
include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake")
cmake_policy (POP)