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

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

Revision: 12976
          http://sourceforge.net/p/plplot/code/12976
Author:   airwin
Date:     2014-02-06 05:04:19 +0000 (Thu, 06 Feb 2014)
Log Message:
-----------
Install Darwin-dmd.cmake (which is likely necessary for the
CMake-based build system for the installed D examples on Mac OS X).

Make CMake minimum version and policy for the installed examples
configuration consistent with the core configuration.

Output CMAKE_PLATFORM_INFO_DIR since there has sometimes been trouble
with that variable being defined.

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

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2014-02-05 22:23:38 UTC (rev 12975)
+++ trunk/examples/CMakeLists.txt	2014-02-06 05:04:19 UTC (rev 12976)
@@ -360,10 +360,12 @@
       language_support/cmake:CMakeDInformation.cmake
       language_support/cmake:CMakeDetermineDCompiler.cmake
       language_support/cmake:CMakeTestDCompiler.cmake
-      language_support/cmake/Platform:/Linux-dmd.cmake
+      language_support/cmake/Platform:Darwin-dmd.cmake
+      language_support/cmake/Platform:Linux-dmd.cmake
       language_support/cmake/Platform:Linux-gdc.cmake
       language_support/cmake/Platform:Windows-dmd.cmake
       language_support/cmake/Platform:Windows-gdc.cmake
+      language_support/cmake/Platform:Windows-gdc.cmake
       )
   endif(ENABLE_d)
 
@@ -383,23 +385,20 @@
   message(STATUS "CMake version = ${CMAKE_VERSION}")
   message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
 
-  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")
+  # The minimum version and policy settings normally follow what is
+  # done for the core build.  Check the core build for the reasons for
+  # these decisions.
+  cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+  if(POLICY CMP0022)
+    message(STATUS "Explicitly setting policy CMP0022 to OLD")
+    cmake_policy(SET CMP0022 OLD)
+  endif(POLICY CMP0022)
+  if(POLICY CMP0023)
+    message(STATUS "Explicitly setting policy CMP0023 to OLD")
+    cmake_policy(SET CMP0023 OLD)
+  endif(POLICY CMP0023)
 
+  message(STATUS "CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
   # Locations where PLplot cmake build system first looks for cmake modules.
   set(CMAKE_MODULE_PATH
     ${PROJECT_SOURCE_DIR}/cmake/modules

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