[Plplot-cvs] SF.net SVN: plplot:[12597] trunk/cmake/build_projects

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

Revision: 12597
          http://sourceforge.net/p/plplot/code/12597
Author:   airwin
Date:     2013-10-13 15:54:18 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Restore minimum version of 2.8.11.2 (and also the associated touch
patch that is needed for that case) since there is some evidence that
2.8.12 is problematic on Wine.

Modified Paths:
--------------
    trunk/cmake/build_projects/CMakeLists.txt
    trunk/cmake/build_projects/ExternalProject.cmake

Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt	2013-10-13 05:23:53 UTC (rev 12596)
+++ trunk/cmake/build_projects/CMakeLists.txt	2013-10-13 15:54:18 UTC (rev 12597)
@@ -25,7 +25,7 @@
 message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
 message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
 
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
 
 set(EP_BASE ${CMAKE_BINARY_DIR}/build_projects)
 message(STATUS "EP_BASE = ${EP_BASE}")

Modified: trunk/cmake/build_projects/ExternalProject.cmake
===================================================================
--- trunk/cmake/build_projects/ExternalProject.cmake	2013-10-13 05:23:53 UTC (rev 12596)
+++ trunk/cmake/build_projects/ExternalProject.cmake	2013-10-13 15:54:18 UTC (rev 12597)
@@ -1121,7 +1121,7 @@
     set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
     set(touch)
   else()
-    set(touch ${CMAKE_COMMAND} -E touch ${stamp_file})
+    set(touch ${TOUCH_EXECUTABLE} ${stamp_file})
   endif()
 
   # Wrap with log script?
@@ -1791,8 +1791,8 @@
     OUTPUT ${complete_outputs}
     COMMENT "Completed '${name}'"
     COMMAND ${CMAKE_COMMAND} -E make_directory ${cmf_dir}${cfgdir}
-    COMMAND ${CMAKE_COMMAND} -E touch ${complete_stamp_file}
-    COMMAND ${CMAKE_COMMAND} -E touch ${done_stamp_file}
+    COMMAND ${TOUCH_EXECUTABLE} ${complete_stamp_file}
+    COMMAND ${TOUCH_EXECUTABLE} ${done_stamp_file}
     DEPENDS ${install_stamp_file}
     VERBATIM
     )

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