[Cmake-commits] CMake branch, next, updated. v3.0.0-4571-g0449dbf

[Nils Gladitz]

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  0449dbf7f6b21752133352e9cfedcc868aaa48a6 (commit)
       via  b906af0d7d6cc7e02b16f527fa8ae654f95042e6 (commit)
      from  767c8c39ef2a37ab0c3cbe4c50a429abd1613886 (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=0449dbf7f6b21752133352e9cfedcc868aaa48a6
commit 0449dbf7f6b21752133352e9cfedcc868aaa48a6
Merge: 767c8c3 b906af0
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 03:18:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 29 03:18:38 2014 -0400

    Merge topic 'pdb-genex' into next
    
    b906af0d Genex: Extended PDB test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b906af0d7d6cc7e02b16f527fa8ae654f95042e6
commit b906af0d7d6cc7e02b16f527fa8ae654f95042e6
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 09:17:38 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Jul 29 09:17:38 2014 +0200

    Genex: Extended PDB test

diff --git a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-stderr.txt b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-stderr.txt
new file mode 100644
index 0000000..831edad
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at NonValidCompiler-TARGET_PDB_FILE.cmake:6 \(file\):
+  Error evaluating generator expression:
+
+    \$<TARGET_PDB_FILE:empty>
+
+  TARGET_PDB_FILE is not supported by the target linker.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE.cmake b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE.cmake
new file mode 100644
index 0000000..84a2b2e
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE.cmake
@@ -0,0 +1,9 @@
+
+enable_language(C)
+
+add_library(empty STATIC empty.c)
+
+file(GENERATE
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test.txt"
+  CONTENT "[$<TARGET_PDB_FILE:empty>]"
+)
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index 75f2cc9..ca2d7ea 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -21,3 +21,7 @@ if(RunCMake_CXX_COMPILER_ID MATCHES "MSVC")
   run_cmake(NonValidTarget-TARGET_PDB_FILE)
   run_cmake(ValidTarget-TARGET_PDB_FILE)
 endif()
+
+if(NOT WIN32)
+  run_cmake(NonValidCompiler-TARGET_PDB_FILE)
+endif()

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

Summary of changes:
 .../NonValidCompiler-TARGET_PDB_FILE-result.txt}                   |    0
 ...FILE-stderr.txt => NonValidCompiler-TARGET_PDB_FILE-stderr.txt} |    4 ++--
 ...ARGET_PDB_FILE.cmake => NonValidCompiler-TARGET_PDB_FILE.cmake} |    0
 Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake              |    4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorExpression/NonValidCompiler-TARGET_PDB_FILE-result.txt} (100%)
 copy Tests/RunCMake/GeneratorExpression/{NonValidTarget-TARGET_PDB_FILE-stderr.txt => NonValidCompiler-TARGET_PDB_FILE-stderr.txt} (50%)
 copy Tests/RunCMake/GeneratorExpression/{NonValidTarget-TARGET_PDB_FILE.cmake => NonValidCompiler-TARGET_PDB_FILE.cmake} (100%)


hooks/post-receive
-- 
CMake