[ros-diffs] [jgardou] 51152: [CMAKE] - wrap cmake 2.8.4 (which is > 2.8.2, ah ah) policy into right checks - put it in the right place

jgardou at svn.reactos.org jgardou at svn.reactos.org
Sat Mar 26 12:31:05 UTC 2011


Author: jgardou
Date: Sat Mar 26 12:31:05 2011
New Revision: 51152

URL: http://svn.reactos.org/svn/reactos?rev=51152&view=rev
Log:
[CMAKE]
  - wrap cmake 2.8.4 (which is > 2.8.2, ah ah) policy into right checks
  - put it in the right place

Modified:
    branches/cmake-bringup/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=51152&r1=51151&r2=51152&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Mar 26 12:31:05 2011
@@ -1,5 +1,11 @@
 
 cmake_minimum_required(VERSION 2.6)
+
+if(${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    # Shadow cmake provided modules
+    cmake_policy(SET CMP0017 OLD)
+endif()
+
 project(REACTOS)
 
 #versioning
@@ -7,8 +13,6 @@
 
 # Don't escape preprocessor definition values added via add_definitions
 cmake_policy(SET CMP0005 OLD)
-# Shadow cmake provided modules
-cmake_policy(SET CMP0017 OLD)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)




More information about the Ros-diffs mailing list