[Plplot-cvs] SF.net SVN: plplot:[9842] trunk/CMakeLists.txt

[<ai...@us...>]

Revision: 9842
          http://plplot.svn.sourceforge.net/plplot/?rev=9842&view=rev
Author:   airwin
Date:     2009-04-24 05:39:57 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
Move entire check for CMake minimum version after the project file to
accomodate MSYS needs.

Modified Paths:
--------------
    trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2009-04-24 04:37:14 UTC (rev 9841)
+++ trunk/CMakeLists.txt	2009-04-24 05:39:57 UTC (rev 9842)
@@ -19,21 +19,6 @@
 # along with PLplot; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
-message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
-if(MSYS)
-  # Version 2.6.3 or above of cmake is required for MSYS
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
-else(MSYS)
-  # Version 2.6.0 or above of cmake is required for all other platforms
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-endif(MSYS)
-
-
-#foreach(policy RANGE 0 9)
-#  cmake_policy(GET CMP000${policy} policy_result)
-#  message(STATUS "Policy CMP000${policy} is ${policy_result}")
-#endforeach(policy RANGE 0 9)
-
 # Recommended way to do user overrides of C-related variables, is given at
 # http://public.kitware.com/pipermail/cmake/2006-July/010334.html.
 # See also, CMakeCInformation.cmake.  There are also C++, and Fortran-specific
@@ -49,10 +34,20 @@
 
 # For use under MSYS version 2.6.3 or above of cmake is required!
 # The variable MSYS is first known at this point in the build process
-IF(MSYS)
+message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+if(MSYS)
+  # Version 2.6.3 or above of cmake is required for MSYS
   CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
-ENDIF(MSYS)
+else(MSYS)
+  # Version 2.6.0 or above of cmake is required for all other platforms
+  CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+endif(MSYS)
 
+#foreach(policy RANGE 0 9)
+#  cmake_policy(GET CMP000${policy} policy_result)
+#  message(STATUS "Policy CMP000${policy} is ${policy_result}")
+#endforeach(policy RANGE 0 9)
+
 set(PACKAGE plplot)
 
 # Location where PLplot cmake build system first looks for cmake modules.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.