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

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

Revision: 12587
          http://sourceforge.net/p/plplot/code/12587
Author:   airwin
Date:     2013-10-11 18:46:29 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
Bump the minimum version of CMake to 2.8.12 for build_projects.  That
version fixes the time stamp issue where the times are truncated to
the nearest lower second for the "cmake -E touch" command both on
Linux and Windows. Therefore I was also able to revert the previous 
ExternalProject.cmake change where the "cmake -E touch" command was
replaced by the touch command.  This reversion makes the local
ExternalProject.cmake file more consistent with the 2.8.10.2 version
of that file, i.e., the only differences left concern handling
of tar.xz tarballs.

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-11 05:14:45 UTC (rev 12586)
+++ trunk/cmake/build_projects/CMakeLists.txt	2013-10-11 18:46:29 UTC (rev 12587)
@@ -25,7 +25,7 @@
 message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
 message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
 
-cmake_minimum_required(VERSION 2.8.10.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 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-11 05:14:45 UTC (rev 12586)
+++ trunk/cmake/build_projects/ExternalProject.cmake	2013-10-11 18:46:29 UTC (rev 12587)
@@ -1029,7 +1029,7 @@
     set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
     set(touch)
   else()
-    set(touch ${TOUCH_EXECUTABLE} ${stamp_file})
+    set(touch ${CMAKE_COMMAND} -E touch ${stamp_file})
   endif()
 
   # Wrap with log script?
@@ -1685,8 +1685,8 @@
     OUTPUT ${complete_outputs}
     COMMENT "Completed '${name}'"
     COMMAND ${CMAKE_COMMAND} -E make_directory ${cmf_dir}${cfgdir}
-    COMMAND ${TOUCH_EXECUTABLE} ${complete_stamp_file}
-    COMMAND ${TOUCH_EXECUTABLE} ${done_stamp_file}
+    COMMAND ${CMAKE_COMMAND} -E touch ${complete_stamp_file}
+    COMMAND ${CMAKE_COMMAND} -E touch ${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.