[Cmake-commits] CMake branch, next, updated. v3.1.1-2273-g852f738
Brad King
brad.king at kitware.com
Fri Jan 23 09:32:27 EST 2015
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 852f738c0911975d8f39491f288158fcf3795fe1 (commit)
via a67be306809f9ecf87499fcb6f70f24e428d612f (commit)
from cda6e0784dbc387abf96a9b9ae1e3695aa3e7c17 (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=852f738c0911975d8f39491f288158fcf3795fe1
commit 852f738c0911975d8f39491f288158fcf3795fe1
Merge: cda6e07 a67be30
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 23 09:32:26 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 23 09:32:26 2015 -0500
Merge topic 'ninja-generate-outputs' into next
a67be306 Revert topic 'ninja-generate-outputs'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a67be306809f9ecf87499fcb6f70f24e428d612f
commit a67be306809f9ecf87499fcb6f70f24e428d612f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 23 09:30:55 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 23 09:31:12 2015 -0500
Revert topic 'ninja-generate-outputs'
Byproducts like configure_file outputs cannot be listed as build rule
outputs for Ninja or they will always be considered older than the
CMakeCache.txt input. Another solution will be needed.
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 3b599be..3c07be1 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1119,12 +1119,11 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
/*deptype=*/ "",
/*rspfile=*/ "",
/*rspcontent*/ "",
- /*restat=*/ "1",
+ /*restat=*/ "",
/*generator=*/ true);
cmLocalNinjaGenerator *ng = static_cast<cmLocalNinjaGenerator *>(lg);
- cmNinjaDeps outputs;
cmNinjaDeps implicitDeps;
for(std::vector<cmLocalGenerator*>::const_iterator i =
this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i)
@@ -1135,30 +1134,13 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
{
implicitDeps.push_back(ng->ConvertToNinjaPath(*fi));
}
- std::vector<std::string> const& localOutputs =
- (*i)->GetMakefile()->GetOutputFiles();
- for(std::vector<std::string>::const_iterator o = localOutputs.begin();
- o != localOutputs.end(); ++o)
- {
- outputs.push_back(ng->ConvertToNinjaPath(*o));
- }
}
- outputs.push_back(NINJA_BUILD_FILE);
implicitDeps.push_back("CMakeCache.txt");
std::sort(implicitDeps.begin(), implicitDeps.end());
implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
implicitDeps.end());
- std::sort(outputs.begin(), outputs.end());
- outputs.erase(std::unique(outputs.begin(), outputs.end()),
- outputs.end());
-
- cmNinjaDeps filteredOutputs;
- std::set_difference(outputs.begin(), outputs.end(),
- implicitDeps.begin(), implicitDeps.end(),
- std::back_inserter(filteredOutputs));
-
cmNinjaVars variables;
// Use 'console' pool to get non buffered output of the CMake re-run call
// Available since Ninja 1.5
@@ -1170,7 +1152,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
this->WriteBuild(os,
"Re-run CMake if any of its inputs changed.",
"RERUN_CMAKE",
- /*outputs=*/ filteredOutputs,
+ /*outputs=*/ cmNinjaDeps(1, NINJA_BUILD_FILE),
/*explicitDeps=*/ cmNinjaDeps(),
implicitDeps,
/*orderOnlyDeps=*/ cmNinjaDeps(),
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 358a918..3a61751 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -175,7 +175,3 @@ add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
-
-if(CMAKE_GENERATOR MATCHES "Ninja")
- add_RunCMake_test(ninja)
-endif()
diff --git a/Tests/RunCMake/Configure/NinjaRerunCMake-nowork-stdout.txt b/Tests/RunCMake/Configure/NinjaRerunCMake-nowork-stdout.txt
deleted file mode 100644
index 76f3cb7..0000000
--- a/Tests/RunCMake/Configure/NinjaRerunCMake-nowork-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-^ninja: no work to do.$
diff --git a/Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stderr.txt b/Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stderr.txt
deleted file mode 100644
index 3510266..0000000
--- a/Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^FALSE$
diff --git a/Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stdout.txt b/Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stdout.txt
deleted file mode 100644
index f6e9e57..0000000
--- a/Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stdout.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^\[1/1\] Re-running CMake\.\.\.
-.*
-ninja: no work to do.$
diff --git a/Tests/RunCMake/Configure/NinjaRerunCMake-stderr.txt b/Tests/RunCMake/Configure/NinjaRerunCMake-stderr.txt
deleted file mode 100644
index 2093e5f..0000000
--- a/Tests/RunCMake/Configure/NinjaRerunCMake-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^TRUE$
diff --git a/Tests/RunCMake/Configure/NinjaRerunCMake.cmake b/Tests/RunCMake/Configure/NinjaRerunCMake.cmake
deleted file mode 100644
index 69b269b..0000000
--- a/Tests/RunCMake/Configure/NinjaRerunCMake.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-enable_language(C)
-configure_file(
- "${CMAKE_CURRENT_BINARY_DIR}/ConfigureFileInput.txt.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ConfigureFileOutput.txt"
- @ONLY
- )
-try_compile(res
- "${CMAKE_CURRENT_BINARY_DIR}"
- SOURCES "${CMAKE_CURRENT_BINARY_DIR}/TryCompileInput.c"
- )
-message("${res}")
diff --git a/Tests/RunCMake/Configure/RunCMakeTest.cmake b/Tests/RunCMake/Configure/RunCMakeTest.cmake
index 8fa7a09..58e1a2a 100644
--- a/Tests/RunCMake/Configure/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Configure/RunCMakeTest.cmake
@@ -23,41 +23,3 @@ file(WRITE "${depend}" "2")
run_cmake_command(RerunCMake-build2 ${CMAKE_COMMAND} --build .)
unset(RunCMake_TEST_BINARY_DIR)
unset(RunCMake_TEST_NO_CLEAN)
-
-if(RunCMake_GENERATOR STREQUAL "Ninja")
- # Use a single build tree for a few tests without cleaning.
- set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/NinjaRerunCMake-build)
- set(RunCMake_TEST_NO_CLEAN 1)
- file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
- file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
- set(in_conf "${RunCMake_TEST_BINARY_DIR}/ConfigureFileInput.txt.in")
- file(WRITE "${in_conf}" "1")
- set(in_tc "${RunCMake_TEST_BINARY_DIR}/TryCompileInput.c")
- file(WRITE "${in_tc}" "int main(void) { return 0; }\n")
-
- # Force NINJA_STATUS to be a certain style to not break the regex.
- set(ENV{NINJA_STATUS} "[%s/%t] ")
-
- message(STATUS "NinjaRerunCMake - First configuration:")
- run_cmake(NinjaRerunCMake)
- run_cmake_command(NinjaRerunCMake-nowork ${CMAKE_COMMAND} --build .)
- execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1) # handle 1s resolution
- message(STATUS "NinjaRerunCMake - Modify try_compile input:")
- file(WRITE "${in_tc}" "does-not-compile\n")
- run_cmake_command(NinjaRerunCMake-rerun ${CMAKE_COMMAND} --build .)
- run_cmake_command(NinjaRerunCMake-nowork ${CMAKE_COMMAND} --build .)
-
- message(STATUS "NinjaRerunCMake - Remove configure_file output:")
- file(REMOVE "${RunCMake_TEST_BINARY_DIR}/ConfigureFileOutput.txt")
- run_cmake_command(NinjaRerunCMake-rerun ${CMAKE_COMMAND} --build .)
- run_cmake_command(NinjaRerunCMake-nowork ${CMAKE_COMMAND} --build .)
-
- execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1) # handle 1s resolution
- message(STATUS "NinjaRerunCMake - Modify configure_file input:")
- file(WRITE "${in_conf}" "2")
- run_cmake_command(NinjaRerunCMake-rerun ${CMAKE_COMMAND} --build .)
- run_cmake_command(NinjaRerunCMake-nowork ${CMAKE_COMMAND} --build .)
-
- unset(RunCMake_TEST_BINARY_DIR)
- unset(RunCMake_TEST_NO_CLEAN)
-endif()
diff --git a/Tests/RunCMake/ninja/CMakeLists.txt b/Tests/RunCMake/ninja/CMakeLists.txt
deleted file mode 100644
index 67a38be..0000000
--- a/Tests/RunCMake/ninja/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 2.8.4)
-
-set(test_binary_dir "${test_binary_root}/init-build")
-
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ninja/RunCMakeTest.cmake b/Tests/RunCMake/ninja/RunCMakeTest.cmake
deleted file mode 100644
index 4bf4ed1..0000000
--- a/Tests/RunCMake/ninja/RunCMakeTest.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-include(RunCMake)
-
-# Test that Ninja is rerun properly.
-set(test_dir "${CMAKE_CURRENT_BINARY_DIR}/ninja/test")
-
-set(RunCMake_BINARY_DIR "${test_dir}")
-run_cmake(init)
-
-function (busy_loop)
- execute_process(
- COMMAND "${CMAKE_COMMAND}" -E sleep
- 2)
-endfunction ()
-
-set(RunCMake_TEST_OPTIONS "-Dtest_binary_root=${test_dir}")
-busy_loop()
-run_cmake(touch_try_compile)
-busy_loop()
-run_cmake(remove_configured_file)
-busy_loop()
-run_cmake(touch_configure)
diff --git a/Tests/RunCMake/ninja/check_build.cmake b/Tests/RunCMake/ninja/check_build.cmake
deleted file mode 100644
index 093f18e..0000000
--- a/Tests/RunCMake/ninja/check_build.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-function (busy_loop)
- execute_process(
- COMMAND "${CMAKE_COMMAND}" -E sleep
- 2)
-endfunction ()
-
-file(TIMESTAMP "${test_binary_dir}/build.ninja" orig_time "%Y%m%d%H%M%S")
-
-busy_loop()
-# Force NINJA_STATUS to be a certain style to not break the regex.
-set(ENV{NINJA_STATUS} "[%s/%t] ")
-execute_process(
- COMMAND "${CMAKE_COMMAND}"
- --build .
- OUTPUT_VARIABLE out
- ERROR_VARIABLE err
- WORKING_DIRECTORY "${test_binary_dir}")
-message("-->${out}<--")
-message("-->${err}<--")
-
-file(TIMESTAMP "${test_binary_dir}/build.ninja" rerun_time "%Y%m%d%H%M%S")
-
-if (NOT rerun_time GREATER orig_time)
- message(FATAL_ERROR "Ninja did not rerun? (old: ${orig_time}; new: ${rerun_time})")
-endif ()
-
-busy_loop()
-execute_process(
- COMMAND "${CMAKE_COMMAND}"
- --build .
- OUTPUT_VARIABLE out
- ERROR_VARIABLE err
- WORKING_DIRECTORY "${test_binary_dir}")
-message("-->${out}<--")
-message("-->${err}<--")
-
-file(TIMESTAMP "${test_binary_dir}/build.ninja" noop_time "%Y%m%d%H%M%S")
-
-if (NOT rerun_time EQUAL noop_time)
- message(FATAL_ERROR "Ninja found something to do? (old: ${rerun_time}; new: ${noop_time})")
-endif ()
diff --git a/Tests/RunCMake/ninja/init-stderr.txt b/Tests/RunCMake/ninja/init-stderr.txt
deleted file mode 100644
index 3510266..0000000
--- a/Tests/RunCMake/ninja/init-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^FALSE$
diff --git a/Tests/RunCMake/ninja/init.cmake b/Tests/RunCMake/ninja/init.cmake
deleted file mode 100644
index 33f4be1..0000000
--- a/Tests/RunCMake/ninja/init.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(ninja C)
-
-set(in_conf "${CMAKE_CURRENT_BINARY_DIR}/test.txt.in")
-
-if (NOT EXISTS "${in_conf}")
- file(WRITE "${in_conf}" "")
-endif ()
-
-configure_file(
- "${in_conf}"
- "${CMAKE_CURRENT_BINARY_DIR}/test.txt")
-
-set(in_try_compile "${CMAKE_CURRENT_BINARY_DIR}/tc.c")
-
-if (NOT EXISTS "${in_try_compile}")
- file(WRITE "${in_try_compile}" "int main(int, char**) { return 0; }")
-endif ()
-
-try_compile(res
- "${CMAKE_CURRENT_BINARY_DIR}/bin"
- SOURCES "${in_try_compile}")
-message("${res}")
diff --git a/Tests/RunCMake/ninja/remove_configured_file-stderr.txt b/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
deleted file mode 100644
index 0ba5a9b..0000000
--- a/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-^-->\[1/1\] Re-running CMake\.\.\.
-.*
-ninja: no work to do.
-<--
--->FALSE
-<--
--->ninja: no work to do.
-<--
---><--$
diff --git a/Tests/RunCMake/ninja/remove_configured_file.cmake b/Tests/RunCMake/ninja/remove_configured_file.cmake
deleted file mode 100644
index 6cd9d61..0000000
--- a/Tests/RunCMake/ninja/remove_configured_file.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-file(REMOVE "${test_binary_dir}/test.txt")
-
-include("${CMAKE_CURRENT_LIST_DIR}/check_build.cmake")
diff --git a/Tests/RunCMake/ninja/touch_configure-stderr.txt b/Tests/RunCMake/ninja/touch_configure-stderr.txt
deleted file mode 100644
index 0ba5a9b..0000000
--- a/Tests/RunCMake/ninja/touch_configure-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-^-->\[1/1\] Re-running CMake\.\.\.
-.*
-ninja: no work to do.
-<--
--->FALSE
-<--
--->ninja: no work to do.
-<--
---><--$
diff --git a/Tests/RunCMake/ninja/touch_configure.cmake b/Tests/RunCMake/ninja/touch_configure.cmake
deleted file mode 100644
index a9f4a44..0000000
--- a/Tests/RunCMake/ninja/touch_configure.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-execute_process(
- COMMAND "${CMAKE_COMMAND}" -E touch
- "${test_binary_dir}/test.txt.in")
-
-include("${CMAKE_CURRENT_LIST_DIR}/check_build.cmake")
diff --git a/Tests/RunCMake/ninja/touch_try_compile-stderr.txt b/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
deleted file mode 100644
index 0ba5a9b..0000000
--- a/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-^-->\[1/1\] Re-running CMake\.\.\.
-.*
-ninja: no work to do.
-<--
--->FALSE
-<--
--->ninja: no work to do.
-<--
---><--$
diff --git a/Tests/RunCMake/ninja/touch_try_compile.cmake b/Tests/RunCMake/ninja/touch_try_compile.cmake
deleted file mode 100644
index 43936d0..0000000
--- a/Tests/RunCMake/ninja/touch_try_compile.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-execute_process(
- COMMAND "${CMAKE_COMMAND}" -E touch
- "${test_binary_dir}/tc.c")
-
-include("${CMAKE_CURRENT_LIST_DIR}/check_build.cmake")
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalNinjaGenerator.cxx | 22 +----------
Tests/RunCMake/CMakeLists.txt | 4 --
.../Configure/NinjaRerunCMake-nowork-stdout.txt | 1 -
.../Configure/NinjaRerunCMake-rerun-stderr.txt | 1 -
.../Configure/NinjaRerunCMake-rerun-stdout.txt | 3 --
.../RunCMake/Configure/NinjaRerunCMake-stderr.txt | 1 -
Tests/RunCMake/Configure/NinjaRerunCMake.cmake | 11 ------
Tests/RunCMake/Configure/RunCMakeTest.cmake | 38 ------------------
Tests/RunCMake/ninja/CMakeLists.txt | 6 ---
Tests/RunCMake/ninja/RunCMakeTest.cmake | 21 ----------
Tests/RunCMake/ninja/check_build.cmake | 41 --------------------
Tests/RunCMake/ninja/init-stderr.txt | 1 -
Tests/RunCMake/ninja/init.cmake | 23 -----------
.../ninja/remove_configured_file-stderr.txt | 9 -----
Tests/RunCMake/ninja/remove_configured_file.cmake | 3 --
Tests/RunCMake/ninja/touch_configure-stderr.txt | 9 -----
Tests/RunCMake/ninja/touch_configure.cmake | 5 ---
Tests/RunCMake/ninja/touch_try_compile-stderr.txt | 9 -----
Tests/RunCMake/ninja/touch_try_compile.cmake | 5 ---
19 files changed, 2 insertions(+), 211 deletions(-)
delete mode 100644 Tests/RunCMake/Configure/NinjaRerunCMake-nowork-stdout.txt
delete mode 100644 Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stderr.txt
delete mode 100644 Tests/RunCMake/Configure/NinjaRerunCMake-rerun-stdout.txt
delete mode 100644 Tests/RunCMake/Configure/NinjaRerunCMake-stderr.txt
delete mode 100644 Tests/RunCMake/Configure/NinjaRerunCMake.cmake
delete mode 100644 Tests/RunCMake/ninja/CMakeLists.txt
delete mode 100644 Tests/RunCMake/ninja/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/ninja/check_build.cmake
delete mode 100644 Tests/RunCMake/ninja/init-stderr.txt
delete mode 100644 Tests/RunCMake/ninja/init.cmake
delete mode 100644 Tests/RunCMake/ninja/remove_configured_file-stderr.txt
delete mode 100644 Tests/RunCMake/ninja/remove_configured_file.cmake
delete mode 100644 Tests/RunCMake/ninja/touch_configure-stderr.txt
delete mode 100644 Tests/RunCMake/ninja/touch_configure.cmake
delete mode 100644 Tests/RunCMake/ninja/touch_try_compile-stderr.txt
delete mode 100644 Tests/RunCMake/ninja/touch_try_compile.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list