[Cmake-commits] CMake branch, next, updated. v3.2.2-3173-gacd20f4

[Brad King]

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  acd20f46b3e87af03da49b9337272e3b1297b4ba (commit)
       via  89253992b8237d8c3bd93c2194dcd8bc18fa55db (commit)
      from  b9a2166437958b8f46814c6c50892850fff3ba59 (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=acd20f46b3e87af03da49b9337272e3b1297b4ba
commit acd20f46b3e87af03da49b9337272e3b1297b4ba
Merge: b9a2166 8925399
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 11:54:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 11:54:34 2015 -0400

    Merge topic 'test-genex-TARGET_FILE-on-INTERFACE' into next
    
    89253992 Tests: Add case for rejecting $<TARGET_FILE:...> on an INTERFACE library


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89253992b8237d8c3bd93c2194dcd8bc18fa55db
commit 89253992b8237d8c3bd93c2194dcd8bc18fa55db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 11:51:34 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 11:53:36 2015 -0400

    Tests: Add case for rejecting $<TARGET_FILE:...> on an INTERFACE library
    
    Add an explicit test for this existing error.  We already cover it for
    an OBJECT library but INTERFACE libraries are not allowed either.

diff --git a/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-result.txt b/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-stderr.txt b/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-stderr.txt
new file mode 100644
index 0000000..3aa457e
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-stderr.txt
@@ -0,0 +1,26 @@
+CMake Error at BadTargetTypeInterface.cmake:[0-9]+ \(add_custom_target\):
+  Error evaluating generator expression:
+
+    \$<TARGET_FILE:iface>
+
+  Target "iface" is not an executable or library.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at BadTargetTypeInterface.cmake:[0-9]+ \(add_custom_target\):
+  Error evaluating generator expression:
+
+    \$<TARGET_SONAME_FILE:iface>
+
+  Target "iface" is not an executable or library.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
++
+CMake Error at BadTargetTypeInterface.cmake:[0-9]+ \(add_custom_target\):
+  Error evaluating generator expression:
+
+    \$<TARGET_LINKER_FILE:iface>
+
+  Target "iface" is not an executable or library.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface.cmake b/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface.cmake
new file mode 100644
index 0000000..19566f4
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface.cmake
@@ -0,0 +1,6 @@
+add_library(iface INTERFACE)
+add_custom_target(check ALL COMMAND echo
+  $<TARGET_FILE:iface>
+  $<TARGET_SONAME_FILE:iface>
+  $<TARGET_LINKER_FILE:iface>
+  )
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index 542b7fc..1c8fab5 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -7,6 +7,7 @@ run_cmake(BadNOT)
 run_cmake(BadStrEqual)
 run_cmake(BadZero)
 run_cmake(BadTargetName)
+run_cmake(BadTargetTypeInterface)
 run_cmake(BadTargetTypeObject)
 run_cmake(BadInstallPrefix)
 run_cmake(CMP0044-WARN)

-----------------------------------------------------------------------

Summary of changes:
 .../BadTargetTypeInterface-result.txt}             |    0
 .../BadTargetTypeInterface-stderr.txt              |   26 ++++++++++++++++++++
 .../BadTargetTypeInterface.cmake                   |    6 +++++
 .../GeneratorExpression/RunCMakeTest.cmake         |    1 +
 4 files changed, 33 insertions(+)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/BadTargetTypeInterface-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/BadTargetTypeInterface.cmake


hooks/post-receive
-- 
CMake