[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1222-g5be9e8f
Brad King
brad.king at kitware.com
Tue Jul 21 14:57:29 EDT 2015
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 5be9e8f54c5a407356af587b28a6a82de527cdda (commit)
via 7e9f908ef54a3c2fe42ae8f9376c77e5bc988a9a (commit)
via 3b09398ae27f0e4b5975920ac2787427ffc6ccc4 (commit)
from 0ed780ea44448d4036eb90ee39566deaaf0ac22e (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=5be9e8f54c5a407356af587b28a6a82de527cdda
commit 5be9e8f54c5a407356af587b28a6a82de527cdda
Merge: 0ed780e 7e9f908
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 14:57:28 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 14:57:28 2015 -0400
Merge topic 'export-no-custom-target' into next
7e9f908e export: Reject custom target exports earlier (#15657)
3b09398a Tests: Teach RunCMake.export to enable languages only when needed
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e9f908ef54a3c2fe42ae8f9376c77e5bc988a9a
commit 7e9f908ef54a3c2fe42ae8f9376c77e5bc988a9a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 14:37:20 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 14:39:10 2015 -0400
export: Reject custom target exports earlier (#15657)
Diagnose and reject custom targets given to the export() command
immediately. Previously we would generate an internal error later.
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 43d26f9..96ea77b 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -177,6 +177,12 @@ bool cmExportCommand
this->SetError(e.str());
return false;
}
+ if (target->GetType() == cmTarget::UTILITY)
+ {
+ this->SetError("given custom target \"" + *currentTarget
+ + "\" which may not be exported.");
+ return false;
+ }
}
else
{
diff --git a/Tests/RunCMake/export/CustomTarget-result.txt b/Tests/RunCMake/export/CustomTarget-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/export/CustomTarget-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/export/CustomTarget-stderr.txt b/Tests/RunCMake/export/CustomTarget-stderr.txt
new file mode 100644
index 0000000..57a9af3
--- /dev/null
+++ b/Tests/RunCMake/export/CustomTarget-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CustomTarget.cmake:[0-9]+ \(export\):
+ export given custom target "CustomTarget" which may not be exported.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/export/CustomTarget.cmake b/Tests/RunCMake/export/CustomTarget.cmake
new file mode 100644
index 0000000..4d2bf18
--- /dev/null
+++ b/Tests/RunCMake/export/CustomTarget.cmake
@@ -0,0 +1,2 @@
+add_custom_target(CustomTarget)
+export(TARGETS CustomTarget FILE somefile.cmake)
diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake
index 4b04f18..6d0b7ca 100644
--- a/Tests/RunCMake/export/RunCMakeTest.cmake
+++ b/Tests/RunCMake/export/RunCMakeTest.cmake
@@ -1,5 +1,6 @@
include(RunCMake)
+run_cmake(CustomTarget)
run_cmake(TargetNotFound)
run_cmake(AppendExport)
run_cmake(OldIface)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b09398ae27f0e4b5975920ac2787427ffc6ccc4
commit 3b09398ae27f0e4b5975920ac2787427ffc6ccc4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 14:27:00 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 14:29:10 2015 -0400
Tests: Teach RunCMake.export to enable languages only when needed
diff --git a/Tests/RunCMake/export/AppendExport-stderr.txt b/Tests/RunCMake/export/AppendExport-stderr.txt
index 6e385d4..d71620e 100644
--- a/Tests/RunCMake/export/AppendExport-stderr.txt
+++ b/Tests/RunCMake/export/AppendExport-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at AppendExport.cmake:8 \(export\):
+CMake Error at AppendExport.cmake:[0-9]+ \(export\):
export EXPORT signature does not recognise the APPEND option.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/export/AppendExport.cmake b/Tests/RunCMake/export/AppendExport.cmake
index f36010b..2a99dfc 100644
--- a/Tests/RunCMake/export/AppendExport.cmake
+++ b/Tests/RunCMake/export/AppendExport.cmake
@@ -1,3 +1,4 @@
+enable_language(CXX)
add_library(foo empty.cpp)
export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake")
install(TARGETS foo EXPORT fooExport
diff --git a/Tests/RunCMake/export/CMakeLists.txt b/Tests/RunCMake/export/CMakeLists.txt
index be9d403..12cd3c7 100644
--- a/Tests/RunCMake/export/CMakeLists.txt
+++ b/Tests/RunCMake/export/CMakeLists.txt
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
-project(${RunCMake_TEST})
+project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/export/OldIface-stderr.txt b/Tests/RunCMake/export/OldIface-stderr.txt
index afb4ae3..818c2cb 100644
--- a/Tests/RunCMake/export/OldIface-stderr.txt
+++ b/Tests/RunCMake/export/OldIface-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at OldIface.cmake:8 \(export\):
+CMake Error at OldIface.cmake:[0-9]+ \(export\):
export EXPORT signature does not recognise the
EXPORT_LINK_INTERFACE_LIBRARIES option.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/export/OldIface.cmake b/Tests/RunCMake/export/OldIface.cmake
index 5fb8e25..833b023 100644
--- a/Tests/RunCMake/export/OldIface.cmake
+++ b/Tests/RunCMake/export/OldIface.cmake
@@ -1,3 +1,4 @@
+enable_language(CXX)
add_library(foo empty.cpp)
export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake")
install(TARGETS foo EXPORT fooExport
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportCommand.cxx | 6 ++++++
Tests/RunCMake/export/AppendExport-stderr.txt | 2 +-
Tests/RunCMake/export/AppendExport.cmake | 1 +
Tests/RunCMake/export/CMakeLists.txt | 2 +-
.../CMP0004-NEW-result.txt => export/CustomTarget-result.txt} | 0
Tests/RunCMake/export/CustomTarget-stderr.txt | 4 ++++
Tests/RunCMake/export/CustomTarget.cmake | 2 ++
Tests/RunCMake/export/OldIface-stderr.txt | 2 +-
Tests/RunCMake/export/OldIface.cmake | 1 +
Tests/RunCMake/export/RunCMakeTest.cmake | 1 +
10 files changed, 18 insertions(+), 3 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => export/CustomTarget-result.txt} (100%)
create mode 100644 Tests/RunCMake/export/CustomTarget-stderr.txt
create mode 100644 Tests/RunCMake/export/CustomTarget.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list