[Cmake-commits] CMake branch, next, updated. v2.8.12-4574-g09cd12b

[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  09cd12bc5ad9742a02c018bda50b900c5cfe86e1 (commit)
       via  95c3ada9fc792e2e9a980e7a2c3a38b0a0f2a698 (commit)
      from  81863d5625cb25b4870beaab9f2b012c5476cbe0 (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=09cd12bc5ad9742a02c018bda50b900c5cfe86e1
commit 09cd12bc5ad9742a02c018bda50b900c5cfe86e1
Merge: 81863d5 95c3ada
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 28 09:20:28 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 28 09:20:28 2013 -0400

    Merge topic 'fix-custom-source-with-flags-crash' into next
    
    95c3ada Tests: don't reference issue 14511 in the source_in_custom_target test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95c3ada9fc792e2e9a980e7a2c3a38b0a0f2a698
commit 95c3ada9fc792e2e9a980e7a2c3a38b0a0f2a698
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 28 14:11:31 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Oct 28 14:11:31 2013 +0100

    Tests: don't reference issue 14511 in the source_in_custom_target test

diff --git a/Tests/CustomCommand/CMakeLists.txt b/Tests/CustomCommand/CMakeLists.txt
index f0229df..ff96add 100644
--- a/Tests/CustomCommand/CMakeLists.txt
+++ b/Tests/CustomCommand/CMakeLists.txt
@@ -450,6 +450,9 @@ add_custom_target(perconfig_target ALL
   COMMAND ${CMAKE_COMMAND} -E echo "perconfig=$<TARGET_FILE:perconfig>" "config=$<CONFIGURATION>"
   DEPENDS perconfig.out)
 
-# Test SOURCES in add_custom_target() with COMPILE_DEFINITIONS (Issue #14511)
-add_custom_target(issue14511 SOURCES issue14511.cpp)
-set_property(SOURCE issue14511 PROPERTY COMPILE_DEFINITIONS "TEST")
+# Test SOURCES in add_custom_target() with COMPILE_DEFINITIONS
+# which previously caused a crash in the makefile generators.
+add_custom_target(source_in_custom_target SOURCES source_in_custom_target.cpp)
+set_property(SOURCE source_in_custom_target
+  PROPERTY COMPILE_DEFINITIONS "TEST"
+)
diff --git a/Tests/CustomCommand/issue14511.cpp b/Tests/CustomCommand/source_in_custom_target.cpp
similarity index 100%
rename from Tests/CustomCommand/issue14511.cpp
rename to Tests/CustomCommand/source_in_custom_target.cpp

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

Summary of changes:
 Tests/CustomCommand/CMakeLists.txt                 |    9 ++++++---
 ...{issue14511.cpp => source_in_custom_target.cpp} |    0
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename Tests/CustomCommand/{issue14511.cpp => source_in_custom_target.cpp} (100%)


hooks/post-receive
-- 
CMake