Better CMake policy detection

- thanks to Rebecca Palmer for suggesting this!
2015-02-10 17:11:31 +00:00 · 2015-02-10 17:11:31 +00:00 · b2ac9982d4
commit b2ac9982d4
parent 84cbfb2e98
1 changed files with 6 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,10 +1,12 @@
 cmake_minimum_required (VERSION 2.6.4)

 if(COMMAND cmake_policy)
-    if(${CMAKE_MAJOR_VERSION} GREATER 2) # version 3 or higher
-        cmake_policy(SET CMP0054 NEW)
-        cmake_policy(SET CMP0042 NEW)
-    endif()
+   if(POLICY CMP0054)
+       cmake_policy(SET CMP0054 NEW)
+   endif()
+   if(POLICY CMP0042)
+       cmake_policy(SET CMP0042 NEW)
+   endif()
 endif()

 include (CheckFunctionExists)