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 67e7b4843d0df72f6b50278970352c42852ead17 (commit)
via b59d4aa65317e1c2292bd70d85e2de65fe773dec (commit)
from 5be433e1cad0265f8e972c7a18f3f489878657fe (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=67e7b4843d0df72f6b50278970352c42852ead17
commit 67e7b4843d0df72f6b50278970352c42852ead17
Merge: 5be433e b59d4aa
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Mon Feb 29 03:30:27 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Feb 29 03:30:27 2016 -0500
Merge topic 'xcode-regenerate-on-deleted-files' into next
b59d4aa6 Revert "Xcode: ReRunCMake even if files disappeared (#15992)"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59d4aa65317e1c2292bd70d85e2de65fe773dec
commit b59d4aa65317e1c2292bd70d85e2de65fe773dec
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Mon Feb 29 09:29:50 2016 +0100
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Mon Feb 29 09:29:50 2016 +0100
Revert "Xcode: ReRunCMake even if files disappeared (#15992)"
Whitespace handling in paths is broken.
This reverts commit aa4b5ea60018e38683fc8960c2e3534845c44a02.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 7844611..ef18729 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -603,8 +603,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
for(std::vector<std::string>::const_iterator i = lfiles.begin();
i != lfiles.end(); ++i)
{
- makefileStream << "\\\n" << "$(wildcard "
- << this->ConvertToRelativeForMake(i->c_str()) << ")";
+ makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str());
}
makefileStream << "\n\t" <<
this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str())
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 274e13e..a07bbbe 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -298,37 +298,3 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY
\"${RunCMake_TEST_BINARY_DIR}\")
)
endfunction()
run_cmake_depends()
-
-# test re-generation of project even if CMakeLists.txt files disappeared
-if(UNIX)
- # 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)
- ]=])
-
- 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-create)
-
- # 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-should-work
- ${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}")
-
- unset(RunCMake_TEST_BINARY_DIR)
- unset(RunCMake_TEST_SOURCE_DIR)
- unset(RunCMake_TEST_NO_CLEAN)
-endif()
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 3 +--
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 34 -------------------------
2 files changed, 1 insertion(+), 36 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
