[Cmake-commits] CMake branch, next, updated. v3.0.0-4597-g604c68e

[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  604c68eb482c0dbeb83056e259ce61c3171c8a62 (commit)
       via  58e9f838ee2f28b7ac63f58c9b0e2489ecaa21ef (commit)
      from  c1f4dd4d54b26dcc13dd8f1d5c363a0dc1cf0058 (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=604c68eb482c0dbeb83056e259ce61c3171c8a62
commit 604c68eb482c0dbeb83056e259ce61c3171c8a62
Merge: c1f4dd4 58e9f83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 29 09:20:54 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 29 09:20:54 2014 -0400

    Merge topic 'pdb-genex' into next
    
    58e9f838 Genex: Revise RunCMake.GeneratorExpression PDB test cases


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58e9f838ee2f28b7ac63f58c9b0e2489ecaa21ef
commit 58e9f838ee2f28b7ac63f58c9b0e2489ecaa21ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 29 09:16:48 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 29 09:20:41 2014 -0400

    Genex: Revise RunCMake.GeneratorExpression PDB test cases
    
    Use if(MSVC) as condition so it passes for Intel on Windows too.
    Add expected stderr in success case to ensure it is empty.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7ba44fb..2375ba6 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -7,7 +7,6 @@ macro(add_RunCMake_test test)
     -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
     -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
     -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
-    -DRunCMake_CXX_COMPILER_ID=${CMAKE_CXX_COMPILER_ID}
     ${${test}_ARGS}
     -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
     )
@@ -22,6 +21,10 @@ if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
   set(File_Generate_ARGS -DXCODE_BELOW_2=1)
 endif()
 
+if(MSVC)
+  set(GeneratorExpression_ARGS -DLINKER_SUPPORTS_PDB=1)
+endif()
+
 add_RunCMake_test(CMP0019)
 add_RunCMake_test(CMP0022)
 add_RunCMake_test(CMP0026)
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index ca2d7ea..6c32393 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -17,11 +17,9 @@ run_cmake(NonValidTarget-CXX_COMPILER_VERSION)
 run_cmake(NonValidTarget-TARGET_PROPERTY)
 run_cmake(NonValidTarget-TARGET_POLICY)
 
-if(RunCMake_CXX_COMPILER_ID MATCHES "MSVC")
+if(LINKER_SUPPORTS_PDB)
   run_cmake(NonValidTarget-TARGET_PDB_FILE)
   run_cmake(ValidTarget-TARGET_PDB_FILE)
-endif()
-
-if(NOT WIN32)
+else()
   run_cmake(NonValidCompiler-TARGET_PDB_FILE)
 endif()
diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
@@ -0,0 +1 @@
+^$

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                                    |    5 ++++-
 Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake            |    6 ++----
 .../ValidTarget-TARGET_PDB_FILE-stderr.txt}                      |    0
 3 files changed, 6 insertions(+), 5 deletions(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt} (100%)


hooks/post-receive
-- 
CMake