[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2443-g10e7bdb
Stephen Kelly
steveire at gmail.com
Thu Apr 17 08:57:03 EDT 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 10e7bdb453fb049f93a97deb9699a5f884f0f994 (commit)
via 86bf91f508b814eeeb2ffcf691aa7be940fbbf89 (commit)
from 80665095b16b061ee4116e222e5d97d56848e6f1 (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=10e7bdb453fb049f93a97deb9699a5f884f0f994
commit 10e7bdb453fb049f93a97deb9699a5f884f0f994
Merge: 8066509 86bf91f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 17 08:57:03 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 17 08:57:03 2014 -0400
Merge topic 'feature-absence-hard-error' into next
86bf91f5 Rename test file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86bf91f508b814eeeb2ffcf691aa7be940fbbf89
commit 86bf91f508b814eeeb2ffcf691aa7be940fbbf89
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 17 14:56:13 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 17 14:56:13 2014 +0200
Rename test file.
Don't overwrite dummy.cpp in the source on in-source build.
diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index f03f33d..62e3ce0 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.0)
project(target_compile_features)
if (NOT CMAKE_CXX_COMPILE_FEATURES)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_dummy.cpp"
"int main(int,char**) { return 0; }\n"
)
- add_executable(target_compile_features "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
+ add_executable(target_compile_features "${CMAKE_CURRENT_BINARY_DIR}/test_dummy.cpp")
return()
endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeCommands/target_compile_features/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list