[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1882-g276f1c3
Stephen Kelly
steveire at gmail.com
Fri Feb 28 14:08:10 EST 2014
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 276f1c3e1a318769321e4997b00b0b2817bcac38 (commit)
via cba43d929f71aa7fdf673a47f2313d6324102d79 (commit)
via 29a9047ba3ab3fdbfb45cafa79ff295994b91e8d (commit)
via 3c47cb460d9801a89345cddca2c98bf622720286 (commit)
from e71cffd131ec556fdb695ff32698a86fa0289dfb (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=276f1c3e1a318769321e4997b00b0b2817bcac38
commit 276f1c3e1a318769321e4997b00b0b2817bcac38
Merge: e71cffd cba43d9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 14:08:09 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 14:08:09 2014 -0500
Merge topic 'alt-test-generator' into next
cba43d92 Move the invocation of the CMAKE_SETUP_TESTING macro.
29a9047b Revert "Tests: Don't expect the Tests dir to be called 'Tests'."
3c47cb46 Put tests in a subdir.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cba43d929f71aa7fdf673a47f2313d6324102d79
commit cba43d929f71aa7fdf673a47f2313d6324102d79
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 20:03:23 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 20:03:23 2014 +0100
Move the invocation of the CMAKE_SETUP_TESTING macro.
Ensure that the CMAKE_TEST_GENERATOR is populated early.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b25c58..c0084c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,6 +427,8 @@ set(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
# install tree.
set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "CMake does not need RPATHs.")
+CMAKE_SETUP_TESTING()
+
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
@@ -537,7 +539,6 @@ add_custom_target(uninstall
include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
-CMAKE_SETUP_TESTING()
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in"
"${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a9047ba3ab3fdbfb45cafa79ff295994b91e8d
commit 29a9047ba3ab3fdbfb45cafa79ff295994b91e8d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 19:54:22 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 19:57:06 2014 +0100
Revert "Tests: Don't expect the Tests dir to be called 'Tests'."
This reverts commit cfb566a620939b9d260f58347651de0a108b7237.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
index d6d78ee..2ec3aef 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt
@@ -15,6 +15,6 @@ CMake Error in CMakeLists.txt:
CMake Error in CMakeLists.txt:
Target "foo" INTERFACE_INCLUDE_DIRECTORIES property contains path:
- ".*Tests/RunCMake/CMP0041/CMP0041-NEW-build/include/\$<TARGET_PROPERTY:NAME>"
+ ".*/Tests/RunCMake/CMP0041/CMP0041-NEW-build/include/\$<TARGET_PROPERTY:NAME>"
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
index 6bc501f..a7d303e 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt
@@ -27,6 +27,6 @@ CMake Warning in CMakeLists.txt:
Target "foo" INTERFACE_INCLUDE_DIRECTORIES property contains path:
- ".*Tests/RunCMake/CMP0041/CMP0041-WARN-build/include/\$<TARGET_PROPERTY:NAME>"
+ ".*/Tests/RunCMake/CMP0041/CMP0041-WARN-build/include/\$<TARGET_PROPERTY:NAME>"
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
index 4df4b5c..9b0a214 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt
@@ -17,6 +17,6 @@ CMake Error in CMakeLists.txt:
CMake Error in CMakeLists.txt:
Target "foo" INTERFACE_INCLUDE_DIRECTORIES property contains path:
- ".*Tests/RunCMake/CMP0041/CMP0041-tid-NEW-build/include/\$<TARGET_PROPERTY:NAME>"
+ ".*/Tests/RunCMake/CMP0041/CMP0041-tid-NEW-build/include/\$<TARGET_PROPERTY:NAME>"
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
index bbc1ae9..aae2c7a 100644
--- a/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt
@@ -29,6 +29,6 @@ CMake Warning in CMakeLists.txt:
Target "foo" INTERFACE_INCLUDE_DIRECTORIES property contains path:
- ".*Tests/RunCMake/CMP0041/CMP0041-tid-WARN-build/include/\$<TARGET_PROPERTY:NAME>"
+ ".*/Tests/RunCMake/CMP0041/CMP0041-tid-WARN-build/include/\$<TARGET_PROPERTY:NAME>"
which is prefixed in the build directory.
diff --git a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
index bc668e8..17621b7 100644
--- a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
+++ b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
@@ -1 +1 @@
--- CMAKE_C_COMPILER is ".*Tests/RunCMake/CompilerChange/cc1.sh"
+-- CMAKE_C_COMPILER is ".*/Tests/RunCMake/CompilerChange/cc1.sh"
diff --git a/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt b/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
index 692fe2c..3a01c53 100644
--- a/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
+++ b/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
@@ -1,4 +1,4 @@
You have changed variables that require your cache to be deleted.
Configure will be re-run and you may have to reset some variables.
The following variables have changed:
-CMAKE_C_COMPILER=.*Tests/RunCMake/CompilerChange/cc2.sh
+CMAKE_C_COMPILER=.*/Tests/RunCMake/CompilerChange/cc2.sh
diff --git a/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt b/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
index 2da017c..26ca964 100644
--- a/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
+++ b/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
@@ -1 +1 @@
--- CMAKE_C_COMPILER is ".*Tests/RunCMake/CompilerChange/cc2.sh"
+-- CMAKE_C_COMPILER is ".*/Tests/RunCMake/CompilerChange/cc2.sh"
diff --git a/Tests/RunCMake/Configure/ErrorLogs-stdout.txt b/Tests/RunCMake/Configure/ErrorLogs-stdout.txt
index f13d739..c467b62 100644
--- a/Tests/RunCMake/Configure/ErrorLogs-stdout.txt
+++ b/Tests/RunCMake/Configure/ErrorLogs-stdout.txt
@@ -1,3 +1,3 @@
-- Configuring incomplete, errors occurred!
-See also ".*Tests/RunCMake/Configure/ErrorLogs-build/CMakeFiles/CMakeOutput\.log"\.
-See also ".*Tests/RunCMake/Configure/ErrorLogs-build/CMakeFiles/CMakeError\.log"\.
+See also ".*/Tests/RunCMake/Configure/ErrorLogs-build/CMakeFiles/CMakeOutput\.log"\.
+See also ".*/Tests/RunCMake/Configure/ErrorLogs-build/CMakeFiles/CMakeError\.log"\.
diff --git a/Tests/RunCMake/include/CMP0024-NEW-stderr.txt b/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
index 627f674..059d7e4 100644
--- a/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
+++ b/Tests/RunCMake/include/CMP0024-NEW-stderr.txt
@@ -5,7 +5,7 @@ CMake Error at subdir2/CMakeLists.txt:2 \(include\):
The file
- .*Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake
+ .*/Tests/RunCMake/include/CMP0024-NEW-build/subdir1/theTargets.cmake
was generated by the export\(\) command. It may not be used as the argument
to the include\(\) command. Use ALIAS targets instead to refer to targets by
diff --git a/Tests/RunCMake/include/CMP0024-WARN-stderr.txt b/Tests/RunCMake/include/CMP0024-WARN-stderr.txt
index a962086..9c79007 100644
--- a/Tests/RunCMake/include/CMP0024-WARN-stderr.txt
+++ b/Tests/RunCMake/include/CMP0024-WARN-stderr.txt
@@ -5,7 +5,7 @@ CMake Warning \(dev\) at subdir2/CMakeLists.txt:2 \(include\):
The file
- .*Tests/RunCMake/include/CMP0024-WARN-build/subdir1/theTargets.cmake
+ .*/Tests/RunCMake/include/CMP0024-WARN-build/subdir1/theTargets.cmake
was generated by the export\(\) command. It should not be used as the
argument to the include\(\) command. Use ALIAS targets instead to refer to
diff --git a/Tests/RunCMake/include/ExportExportInclude-stderr.txt b/Tests/RunCMake/include/ExportExportInclude-stderr.txt
index 98d7298..70d013c 100644
--- a/Tests/RunCMake/include/ExportExportInclude-stderr.txt
+++ b/Tests/RunCMake/include/ExportExportInclude-stderr.txt
@@ -1,6 +1,6 @@
CMake Error at ExportExportInclude.cmake:6 \(include\):
include could not find load file:
- .*Tests/RunCMake/include/ExportExportInclude-build/theTargets.cmake
+ .*/Tests/RunCMake/include/ExportExportInclude-build/theTargets.cmake
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c47cb460d9801a89345cddca2c98bf622720286
commit 3c47cb460d9801a89345cddca2c98bf622720286
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 19:53:54 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 19:57:06 2014 +0100
Put tests in a subdir.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb7ce1e..5b25c58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,6 +439,7 @@ if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
string(MAKE_C_IDENTIFIER "${CMake_TestAlternative}" CMake_TestAlternative)
endif()
+ set(CMake_TestAlternative "${CMake_TestAlternative}/")
endif()
set(CMake_TestDir "${CMake_TestAlternative}Tests")
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 +++-
Tests/RunCMake/CMP0041/CMP0041-NEW-stderr.txt | 2 +-
Tests/RunCMake/CMP0041/CMP0041-WARN-stderr.txt | 2 +-
Tests/RunCMake/CMP0041/CMP0041-tid-NEW-stderr.txt | 2 +-
Tests/RunCMake/CMP0041/CMP0041-tid-WARN-stderr.txt | 2 +-
Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt | 2 +-
Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt | 2 +-
Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt | 2 +-
Tests/RunCMake/Configure/ErrorLogs-stdout.txt | 4 ++--
Tests/RunCMake/include/CMP0024-NEW-stderr.txt | 2 +-
Tests/RunCMake/include/CMP0024-WARN-stderr.txt | 2 +-
Tests/RunCMake/include/ExportExportInclude-stderr.txt | 2 +-
12 files changed, 15 insertions(+), 13 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list