[Cmake-commits] CMake branch, next, updated. v3.1.1-2306-g5b5d8da

[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  5b5d8daf1082dbc0c4c9cdb6097dd6663aea81fb (commit)
       via  b7a1769bdee9169dbda0d7e46fee9ff0bfa3c0fd (commit)
       via  f4bd6712fabf24cd78c72c6d6c2d428a828aa97f (commit)
      from  7bd36637c767f0a8e4dd159d36037b7058ae7b81 (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=5b5d8daf1082dbc0c4c9cdb6097dd6663aea81fb
commit 5b5d8daf1082dbc0c4c9cdb6097dd6663aea81fb
Merge: 7bd3663 b7a1769
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 25 07:57:15 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 25 07:57:15 2015 -0500

    Merge topic 'test-rerun-cmake' into next
    
    b7a1769b fixup! try_compile: Test that CMake re-runs on input change
    f4bd6712 fixup! configure_file: Test that CMake re-runs on input change


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7a1769bdee9169dbda0d7e46fee9ff0bfa3c0fd
commit b7a1769bdee9169dbda0d7e46fee9ff0bfa3c0fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 25 07:43:50 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 25 07:43:50 2015 -0500

    fixup! try_compile: Test that CMake re-runs on input change

diff --git a/Tests/RunCMake/try_compile/RerunCMake-rerun-ninja-no-console-stdout.txt b/Tests/RunCMake/try_compile/RerunCMake-rerun-ninja-no-console-stdout.txt
index e1a1b5a..b0438f5 100644
--- a/Tests/RunCMake/try_compile/RerunCMake-rerun-ninja-no-console-stdout.txt
+++ b/Tests/RunCMake/try_compile/RerunCMake-rerun-ninja-no-console-stdout.txt
@@ -2,4 +2,4 @@ Running CMake on RerunCMake
 FALSE
 -- Configuring done
 -- Generating done
--- Build files have been written to: .*Tests/RunCMake/try_compile/RerunCMake-build
+-- Build files have been written to: .*/Tests/RunCMake/try_compile/RerunCMake-build
diff --git a/Tests/RunCMake/try_compile/RerunCMake-rerun-stdout.txt b/Tests/RunCMake/try_compile/RerunCMake-rerun-stdout.txt
index 867db5f..9c78b26 100644
--- a/Tests/RunCMake/try_compile/RerunCMake-rerun-stdout.txt
+++ b/Tests/RunCMake/try_compile/RerunCMake-rerun-stdout.txt
@@ -1,3 +1,3 @@
 -- Configuring done
 -- Generating done
--- Build files have been written to: .*Tests/RunCMake/try_compile/RerunCMake-build
+-- Build files have been written to: .*/Tests/RunCMake/try_compile/RerunCMake-build
diff --git a/Tests/RunCMake/try_compile/RerunCMake-stdout.txt b/Tests/RunCMake/try_compile/RerunCMake-stdout.txt
index 867db5f..9c78b26 100644
--- a/Tests/RunCMake/try_compile/RerunCMake-stdout.txt
+++ b/Tests/RunCMake/try_compile/RerunCMake-stdout.txt
@@ -1,3 +1,3 @@
 -- Configuring done
 -- Generating done
--- Build files have been written to: .*Tests/RunCMake/try_compile/RerunCMake-build
+-- Build files have been written to: .*/Tests/RunCMake/try_compile/RerunCMake-build

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4bd6712fabf24cd78c72c6d6c2d428a828aa97f
commit f4bd6712fabf24cd78c72c6d6c2d428a828aa97f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 25 07:43:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 25 07:43:23 2015 -0500

    fixup! configure_file: Test that CMake re-runs on input change

diff --git a/Tests/RunCMake/configure_file/RerunCMake-rerun-stdout.txt b/Tests/RunCMake/configure_file/RerunCMake-rerun-stdout.txt
index 1bd5be7..34c873c 100644
--- a/Tests/RunCMake/configure_file/RerunCMake-rerun-stdout.txt
+++ b/Tests/RunCMake/configure_file/RerunCMake-rerun-stdout.txt
@@ -1,3 +1,3 @@
 -- Configuring done
 -- Generating done
--- Build files have been written to: .*Tests/RunCMake/configure_file/RerunCMake-build
+-- Build files have been written to: .*/Tests/RunCMake/configure_file/RerunCMake-build
diff --git a/Tests/RunCMake/configure_file/RerunCMake-stdout.txt b/Tests/RunCMake/configure_file/RerunCMake-stdout.txt
index 1bd5be7..34c873c 100644
--- a/Tests/RunCMake/configure_file/RerunCMake-stdout.txt
+++ b/Tests/RunCMake/configure_file/RerunCMake-stdout.txt
@@ -1,3 +1,3 @@
 -- Configuring done
 -- Generating done
--- Build files have been written to: .*Tests/RunCMake/configure_file/RerunCMake-build
+-- Build files have been written to: .*/Tests/RunCMake/configure_file/RerunCMake-build

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

Summary of changes:
 Tests/RunCMake/configure_file/RerunCMake-rerun-stdout.txt            |    2 +-
 Tests/RunCMake/configure_file/RerunCMake-stdout.txt                  |    2 +-
 .../try_compile/RerunCMake-rerun-ninja-no-console-stdout.txt         |    2 +-
 Tests/RunCMake/try_compile/RerunCMake-rerun-stdout.txt               |    2 +-
 Tests/RunCMake/try_compile/RerunCMake-stdout.txt                     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake