From: <ai...@us...> - 2011-10-26 22:37:01
|
Revision: 12000 http://plplot.svn.sourceforge.net/plplot/?rev=12000&view=rev Author: airwin Date: 2011-10-26 22:36:55 +0000 (Wed, 26 Oct 2011) Log Message: ----------- Bump minimum version of CMake to 2.8.2 for Linux and 2.8.6 for all other platforms as discussed on the plplot-devel mailing list. I have just confirmed that CMake-2.8.6 gives good results on Linux (using the ctest test), but that also needs to be tested on our other platforms. As soon as that platform testing is complete, I plan to remove the CMake-2.6.x logic and files that are currently part of our build system. Modified Paths: -------------- trunk/CMakeLists.txt Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2011-10-21 12:37:41 UTC (rev 11999) +++ trunk/CMakeLists.txt 2011-10-26 22:36:55 UTC (rev 12000) @@ -38,13 +38,25 @@ project(plplot C) message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}") +message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}") -# Note that the variable MSYS is first known at this point in the -# build process in case have different minimum version for that case. +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + # We prefer to support only the latest CMake version because it + # tends to be more free of issues and more consistent with recent + # software releases of software that PLplot depends on than earlier versions. + # However, as a special concession to our modern (not enterprise or + # LTS) Linux distro users so they can avoid a download of recent CMake, + # we allow them to use the system version of + # CMake which at this time (2011-10) is typically 2.8.2 or later. + cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR) +else(CMAKE_SYSTEM_NAME STREQUAL "Linux") + # For non-Linux platforms we prefer to support only the most recent + # CMake version since that tends to be most free of issues and most + # consistent with releases of software that PLplot depends on. The + # most recently released CMake is 2.8.6 at this time (2011-10). + cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) +endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") -# Version 2.6.4 or above of cmake is currently required for all platforms. -cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) - #foreach(policy RANGE 0 9) # cmake_policy(GET CMP000${policy} policy_result) # message(STATUS "Policy CMP000${policy} is ${policy_result}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |