[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7514-g1ef4916
Stephen Kelly
steveire at gmail.com
Fri Feb 7 09:50:06 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 1ef49162117af4f0e40c0445994ae1c72b75daa7 (commit)
via 6d85a6a64c6919c07d983b584bb74f6a29cddac5 (commit)
via 770245e9287de01c990605b54d28302c9cac3340 (commit)
from 02cc73a83cf97bfc8068eba063b16f3dc5f6872e (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=1ef49162117af4f0e40c0445994ae1c72b75daa7
commit 1ef49162117af4f0e40c0445994ae1c72b75daa7
Merge: 02cc73a 6d85a6a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 7 09:50:05 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 7 09:50:05 2014 -0500
Merge topic 'interface-library-signatures' into next
6d85a6a6 add_library: Issue better diagnostic for INTERFACE GLOBAL signature.
770245e9 add_library: Test invalid GLOBAL INTERFACE signature.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d85a6a64c6919c07d983b584bb74f6a29cddac5
commit 6d85a6a64c6919c07d983b584bb74f6a29cddac5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 7 15:31:57 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 7 15:49:15 2014 +0100
add_library: Issue better diagnostic for INTERFACE GLOBAL signature.
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index a29f784..009b1ca 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -173,6 +173,13 @@ bool cmAddLibraryCommand
++s;
importGlobal = true;
}
+ else if(type == cmTarget::INTERFACE_LIBRARY && *s == "GLOBAL")
+ {
+ cmOStringStream e;
+ e << "GLOBAL option may only be used with IMPORTED libraries.";
+ this->SetError(e.str().c_str());
+ return false;
+ }
else
{
break;
diff --git a/Tests/RunCMake/interface_library/invalid_signature-stderr.txt b/Tests/RunCMake/interface_library/invalid_signature-stderr.txt
index 701586a..6374b33 100644
--- a/Tests/RunCMake/interface_library/invalid_signature-stderr.txt
+++ b/Tests/RunCMake/interface_library/invalid_signature-stderr.txt
@@ -84,6 +84,6 @@ Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Error at invalid_signature.cmake:20 \(add_library\):
- add_library INTERFACE library requires no source arguments.
+ add_library GLOBAL option may only be used with IMPORTED libraries.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=770245e9287de01c990605b54d28302c9cac3340
commit 770245e9287de01c990605b54d28302c9cac3340
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 7 15:38:49 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 7 15:49:15 2014 +0100
add_library: Test invalid GLOBAL INTERFACE signature.
This has to be tested separately from the invalid_signature test because
target sources are evaluate at a later time, and earlier errors in the
invalid_signature test cause early exit.
diff --git a/Tests/RunCMake/interface_library/RunCMakeTest.cmake b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
index 9ca9a77..3c457c5 100644
--- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake
+++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake
@@ -5,5 +5,6 @@ run_cmake(target_commands)
run_cmake(no_shared_libs)
run_cmake(whitelist)
run_cmake(invalid_signature)
+run_cmake(global-interface)
run_cmake(genex_link)
run_cmake(add_dependencies)
diff --git a/Tests/RunCMake/interface_library/global-interface-result.txt b/Tests/RunCMake/interface_library/global-interface-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/interface_library/global-interface-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/interface_library/global-interface-stderr.txt b/Tests/RunCMake/interface_library/global-interface-stderr.txt
new file mode 100644
index 0000000..24edd0f
--- /dev/null
+++ b/Tests/RunCMake/interface_library/global-interface-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at global-interface.cmake:2 \(add_library\):
+ Cannot find source file:
+
+ GLOBAL
+
+ Tried extensions \.c \.C \.c\+\+ \.cc \.cpp \.cxx \.m \.M \.mm \.h \.hh \.h\+\+ \.hm \.hpp
+ \.hxx \.in \.txx
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/interface_library/global-interface.cmake b/Tests/RunCMake/interface_library/global-interface.cmake
new file mode 100644
index 0000000..d2bfc64
--- /dev/null
+++ b/Tests/RunCMake/interface_library/global-interface.cmake
@@ -0,0 +1,2 @@
+
+add_library(iface GLOBAL INTERFACE)
diff --git a/Tests/RunCMake/interface_library/invalid_signature.cmake b/Tests/RunCMake/interface_library/invalid_signature.cmake
index 67e3267..4e53534 100644
--- a/Tests/RunCMake/interface_library/invalid_signature.cmake
+++ b/Tests/RunCMake/interface_library/invalid_signature.cmake
@@ -16,5 +16,5 @@ add_library(iface15 ALIAS INTERFACE)
add_library(iface16 INTERFACE INTERFACE)
add_library(iface17 INTERFACE EXCLUDE_FROM_ALL)
add_library(iface18 EXCLUDE_FROM_ALL INTERFACE)
-add_library(iface19 GLOBAL INTERFACE)
+# add_library(iface19 GLOBAL INTERFACE) Tested separately
add_library(iface20 INTERFACE GLOBAL)
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddLibraryCommand.cxx | 7 +++++++
Tests/RunCMake/interface_library/RunCMakeTest.cmake | 1 +
.../global-interface-result.txt} | 0
Tests/RunCMake/interface_library/global-interface-stderr.txt | 9 +++++++++
Tests/RunCMake/interface_library/global-interface.cmake | 2 ++
Tests/RunCMake/interface_library/invalid_signature-stderr.txt | 2 +-
Tests/RunCMake/interface_library/invalid_signature.cmake | 2 +-
7 files changed, 21 insertions(+), 2 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => interface_library/global-interface-result.txt} (100%)
create mode 100644 Tests/RunCMake/interface_library/global-interface-stderr.txt
create mode 100644 Tests/RunCMake/interface_library/global-interface.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list