[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2813-gc09314a
Stephen Kelly
steveire at gmail.com
Tue May 6 14:20:19 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 c09314ad87da2d297fb99184583f69c5ac9d56c0 (commit)
via 27d77323855908555aa82b2410e584f0241b998a (commit)
from 2aa03d35657cac786a6f6464a7a7efe6d9bbcf40 (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=c09314ad87da2d297fb99184583f69c5ac9d56c0
commit c09314ad87da2d297fb99184583f69c5ac9d56c0
Merge: 2aa03d3 27d7732
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 14:20:18 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 14:20:18 2014 -0400
Merge topic 'no-assert-missing-objlib' into next
27d77323 Fix test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27d77323855908555aa82b2410e584f0241b998a
commit 27d77323855908555aa82b2410e584f0241b998a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 20:19:45 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 20:19:45 2014 +0200
Fix test.
diff --git a/Tests/RunCMake/CMP0026/CMakeLists.txt b/Tests/RunCMake/CMP0026/CMakeLists.txt
index f452db1..12cd3c7 100644
--- a/Tests/RunCMake/CMP0026/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0026/CMakeLists.txt
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
-project(${RunCMake_TEST} CXX)
+project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0026/ObjlibNotDefined.cmake b/Tests/RunCMake/CMP0026/ObjlibNotDefined.cmake
index fe7de06..194760c 100644
--- a/Tests/RunCMake/CMP0026/ObjlibNotDefined.cmake
+++ b/Tests/RunCMake/CMP0026/ObjlibNotDefined.cmake
@@ -1,4 +1,6 @@
+enable_language(CXX)
+
add_executable(objlibuser
empty.cpp
$<TARGET_OBJECTS:bar>
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMP0026/CMakeLists.txt | 2 +-
Tests/RunCMake/CMP0026/ObjlibNotDefined.cmake | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list