[Cmake-commits] CMake branch, next, updated. v3.1.1-2292-g57b028d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  57b028dffc1408e39e7112c5fdde4b2efb067280 (commit)
       via  a4605973ff116d11ca96c7b06aa6516bd638429a (commit)
      from  d1b31254f24c2383c072ab88282abfedfb5ccc40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57b028dffc1408e39e7112c5fdde4b2efb067280
commit 57b028dffc1408e39e7112c5fdde4b2efb067280
Merge: d1b3125 a460597
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 23 13:41:42 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 23 13:41:42 2015 -0500

    Merge topic 'ExternalProject-switch-ALWAYS' into next
    
    a4605973 ExternalProject: Allow ALWAYS step property to be switched (#15368)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4605973ff116d11ca96c7b06aa6516bd638429a
commit a4605973ff116d11ca96c7b06aa6516bd638429a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 23 13:28:49 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 23 13:38:59 2015 -0500

    ExternalProject: Allow ALWAYS step property to be switched (#15368)
    
    Within an existing build tree, if the stamp for a step already exists
    when one activates the ALWAYS option, we still want it to always build.
    Remove the step stamp file during CMake configuration to ensure it does
    not exist when the ALWAYS option is enabled.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 52d41eb..74e8ae2 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1456,6 +1456,15 @@ function(ExternalProject_Add_Step name step)
   if(always)
     set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
     set(touch)
+    # Remove any existing stamp in case the option changed in an existing tree.
+    if(CMAKE_CONFIGURATION_TYPES)
+      foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
+        string(REPLACE "/${CMAKE_CFG_INTDIR}" "/${cfg}" stamp_file_config "${stamp_file}")
+        file(REMOVE ${stamp_file_config})
+      endforeach()
+    else()
+      file(REMOVE ${stamp_file})
+    endif()
   else()
     set(touch ${CMAKE_COMMAND} -E touch ${stamp_file})
   endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    9 +++++++++
 1 file changed, 9 insertions(+)


hooks/post-receive
-- 
CMake