[Cmake-commits] CMake branch, master, updated. v3.5.1-423-gf6c5958

[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, master has been updated
       via  f6c5958047ee8a9084bf230a6c1acb4801cb2b93 (commit)
       via  add7abc8352b87184579401cb2493c72e07aa212 (commit)
       via  ff805113c766371677b97d94cd3092cf6ff0bbf6 (commit)
      from  1baf2cbd3dfd76aadcbfd84f6d42d13fcb838218 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6c5958047ee8a9084bf230a6c1acb4801cb2b93
commit f6c5958047ee8a9084bf230a6c1acb4801cb2b93
Merge: 1baf2cb add7abc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 09:03:59 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:03:59 2016 -0400

    Merge topic 'ninja-restat-custom-command-byproducts'
    
    add7abc8 Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)
    ff805113 Ninja: Fix detection of custom command symbolic outputs

diff --cc Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 6b2b85a,0dd27d4..8541070
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@@ -39,48 -39,5 +39,49 @@@ if(NOT RunCMake_GENERATOR MATCHES "Visu
    unset(run_BuildDepends_skip_step_2)
  endif()
  
+ run_BuildDepends(Custom-Symbolic-and-Byproduct)
  run_BuildDepends(Custom-Always)
 +
 +if(RunCMake_GENERATOR MATCHES "Make" AND
 +   NOT "${RunCMake_BINARY_DIR}" STREQUAL "${RunCMake_SOURCE_DIR}")
 +  run_BuildDepends(MakeInProjectOnly)
 +endif()
 +
 +function(run_ReGeneration)
 +  # test re-generation of project even if CMakeLists.txt files disappeared
 +
 +  # Use a single build tree for a few tests without cleaning.
 +  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/regenerate-project-build)
 +  set(RunCMake_TEST_SOURCE_DIR ${RunCMake_BINARY_DIR}/regenerate-project-source)
 +  set(RunCMake_TEST_NO_CLEAN 1)
 +  file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
 +  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
 +  set(ProjectHeader [=[
 +    cmake_minimum_required(VERSION 3.5)
 +    project(Regenerate-Project NONE)
 +  ]=])
 +
 +  # create project with subdirectory
 +  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}"
 +    "add_subdirectory(mysubdir)")
 +  file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
 +  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty")
 +
 +  run_cmake(Regenerate-Project)
 +  execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${fs_delay})
 +
 +  # now we delete the subdirectory and adjust the CMakeLists.txt
 +  file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir")
 +  file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}")
 +
 +  run_cmake_command(Regenerate-Project-Directory-Removed
 +    ${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}")
 +
 +  unset(RunCMake_TEST_BINARY_DIR)
 +  unset(RunCMake_TEST_SOURCE_DIR)
 +  unset(RunCMake_TEST_NO_CLEAN)
 +endfunction()
 +
 +if(RunCMake_GENERATOR STREQUAL "Xcode")
 +  run_ReGeneration(regenerate-project)
 +endif()

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

Summary of changes:
 Source/cmLocalNinjaGenerator.cxx                   |    4 +--
 .../Custom-Symbolic-and-Byproduct.cmake            |   28 ++++++++++++++++++++
 Tests/RunCMake/BuildDepends/RunCMakeTest.cmake     |    1 +
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake


hooks/post-receive
-- 
CMake