[Cmake-commits] CMake branch, next, updated. v3.1.0-2300-g45049ec
Ben Boeckel
ben.boeckel at kitware.com
Wed Jan 21 16:50: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 45049eca97e8931721f4a371e136a012c0473e8d (commit)
via f4b78cf2ac9785ae02e910ac5566718fd8592f10 (commit)
via fe685b92ecffdcb889806b0fc882d3fe75244b59 (commit)
via ae723db5b4b4a4152547eae6166cbcc073767512 (commit)
from 42eb85d6c7bfac664fee8df62bf0ccb84b8e4e5c (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=45049eca97e8931721f4a371e136a012c0473e8d
commit 45049eca97e8931721f4a371e136a012c0473e8d
Merge: 42eb85d f4b78cf
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 21 16:50:26 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 16:50:26 2015 -0500
Merge topic 'ninja-generate-outputs' into next
f4b78cf2 fixup! test: test that ninja regenerates properly
fe685b92 fixup! test: test that ninja regenerates properly
ae723db5 fixup! test: test that ninja regenerates properly
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4b78cf2ac9785ae02e910ac5566718fd8592f10
commit f4b78cf2ac9785ae02e910ac5566718fd8592f10
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 21 16:47:58 2015 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jan 21 16:48:31 2015 -0500
fixup! test: test that ninja regenerates properly
diff --git a/Tests/RunCMake/ninja/check_build.cmake b/Tests/RunCMake/ninja/check_build.cmake
index 7071228..093f18e 100644
--- a/Tests/RunCMake/ninja/check_build.cmake
+++ b/Tests/RunCMake/ninja/check_build.cmake
@@ -23,3 +23,19 @@ 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/remove_configured_file-stderr.txt b/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
index f12a099..0ba5a9b 100644
--- a/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
+++ b/Tests/RunCMake/ninja/remove_configured_file-stderr.txt
@@ -3,4 +3,7 @@
ninja: no work to do.
<--
-->FALSE
-<--$
+<--
+-->ninja: no work to do.
+<--
+--><--$
diff --git a/Tests/RunCMake/ninja/touch_configure-stderr.txt b/Tests/RunCMake/ninja/touch_configure-stderr.txt
index f12a099..0ba5a9b 100644
--- a/Tests/RunCMake/ninja/touch_configure-stderr.txt
+++ b/Tests/RunCMake/ninja/touch_configure-stderr.txt
@@ -3,4 +3,7 @@
ninja: no work to do.
<--
-->FALSE
-<--$
+<--
+-->ninja: no work to do.
+<--
+--><--$
diff --git a/Tests/RunCMake/ninja/touch_try_compile-stderr.txt b/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
index f12a099..0ba5a9b 100644
--- a/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
+++ b/Tests/RunCMake/ninja/touch_try_compile-stderr.txt
@@ -3,4 +3,7 @@
ninja: no work to do.
<--
-->FALSE
-<--$
+<--
+-->ninja: no work to do.
+<--
+--><--$
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe685b92ecffdcb889806b0fc882d3fe75244b59
commit fe685b92ecffdcb889806b0fc882d3fe75244b59
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 21 16:47:58 2015 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jan 21 16:47:58 2015 -0500
fixup! test: test that ninja regenerates properly
diff --git a/Tests/RunCMake/ninja/check_build.cmake b/Tests/RunCMake/ninja/check_build.cmake
index 0969639..7071228 100644
--- a/Tests/RunCMake/ninja/check_build.cmake
+++ b/Tests/RunCMake/ninja/check_build.cmake
@@ -10,7 +10,8 @@ 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_MAKE_PROGRAM}"
+ COMMAND "${CMAKE_COMMAND}"
+ --build .
OUTPUT_VARIABLE out
ERROR_VARIABLE err
WORKING_DIRECTORY "${test_binary_dir}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae723db5b4b4a4152547eae6166cbcc073767512
commit ae723db5b4b4a4152547eae6166cbcc073767512
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 21 16:46:43 2015 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jan 21 16:47:27 2015 -0500
fixup! test: test that ninja regenerates properly
diff --git a/Tests/RunCMake/ninja/init.cmake b/Tests/RunCMake/ninja/init.cmake
index 48b1f23..33f4be1 100644
--- a/Tests/RunCMake/ninja/init.cmake
+++ b/Tests/RunCMake/ninja/init.cmake
@@ -1,11 +1,23 @@
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(
- "${CMAKE_CURRENT_SOURCE_DIR}/test.txt.in"
+ "${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 "${CMAKE_CURRENT_SOURCE_DIR}/tc.c")
+ SOURCES "${in_try_compile}")
message("${res}")
diff --git a/Tests/RunCMake/ninja/tc.c b/Tests/RunCMake/ninja/tc.c
deleted file mode 100644
index ee6947a..0000000
--- a/Tests/RunCMake/ninja/tc.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main(int /*argc*/, char* /*argv*/[])
-{
- return 0;
-}
diff --git a/Tests/RunCMake/ninja/test.txt.in b/Tests/RunCMake/ninja/test.txt.in
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/ninja/touch_configure.cmake b/Tests/RunCMake/ninja/touch_configure.cmake
index 4915081..a9f4a44 100644
--- a/Tests/RunCMake/ninja/touch_configure.cmake
+++ b/Tests/RunCMake/ninja/touch_configure.cmake
@@ -1,5 +1,5 @@
execute_process(
COMMAND "${CMAKE_COMMAND}" -E touch
- "${CMAKE_CURRENT_LIST_DIR}/test.txt.in")
+ "${test_binary_dir}/test.txt.in")
include("${CMAKE_CURRENT_LIST_DIR}/check_build.cmake")
diff --git a/Tests/RunCMake/ninja/touch_try_compile.cmake b/Tests/RunCMake/ninja/touch_try_compile.cmake
index 738cfcb..43936d0 100644
--- a/Tests/RunCMake/ninja/touch_try_compile.cmake
+++ b/Tests/RunCMake/ninja/touch_try_compile.cmake
@@ -1,5 +1,5 @@
execute_process(
COMMAND "${CMAKE_COMMAND}" -E touch
- "${CMAKE_CURRENT_LIST_DIR}/tc.c")
+ "${test_binary_dir}/tc.c")
include("${CMAKE_CURRENT_LIST_DIR}/check_build.cmake")
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/ninja/check_build.cmake | 19 ++++++++++++++++++-
Tests/RunCMake/ninja/init.cmake | 16 ++++++++++++++--
.../ninja/remove_configured_file-stderr.txt | 5 ++++-
Tests/RunCMake/ninja/tc.c | 4 ----
Tests/RunCMake/ninja/touch_configure-stderr.txt | 5 ++++-
Tests/RunCMake/ninja/touch_configure.cmake | 2 +-
Tests/RunCMake/ninja/touch_try_compile-stderr.txt | 5 ++++-
Tests/RunCMake/ninja/touch_try_compile.cmake | 2 +-
8 files changed, 46 insertions(+), 12 deletions(-)
delete mode 100644 Tests/RunCMake/ninja/tc.c
delete mode 100644 Tests/RunCMake/ninja/test.txt.in
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list