[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1559-ga2557e1

[Stephen Kelly]

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  a2557e15a4a97e1b1de74b557f0369fcf41447a4 (commit)
       via  fd42f8d3ad8de8cb21f002d1ca3eacad830a813d (commit)
      from  cb7b6c352c9351c963e82db56d9c9b8fd552f34a (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=a2557e15a4a97e1b1de74b557f0369fcf41447a4
commit a2557e15a4a97e1b1de74b557f0369fcf41447a4
Merge: cb7b6c3 fd42f8d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 28 11:29:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 28 11:29:52 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    fd42f8d3 Avoid running config-specific source test with IDE generators.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd42f8d3ad8de8cb21f002d1ca3eacad830a813d
commit fd42f8d3ad8de8cb21f002d1ca3eacad830a813d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 28 16:29:09 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Mar 28 16:29:09 2014 +0100

    Avoid running config-specific source test with IDE generators.

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 0e295ac..3973653 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -64,7 +64,8 @@ add_custom_command(
   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in"
 )
 
-if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+message("CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
+if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND NOT CMAKE_CONFIGURATION_TYPES)
   set(debug_srcs "$<$<CONFIG:Debug>:debug_class.cpp>" $<$<CONFIG:Debug>:debug_resource.qrc>)
   add_definitions(-DTEST_DEBUG_CLASS)
 endif()

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

Summary of changes:
 Tests/QtAutogen/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake