[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4179-g97e5a38

Stephen Kelly steveire at gmail.com
Fri Sep 13 14:10:21 EDT 2013


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  97e5a3856f9ccc5961d813ec689ffdf45d9f2612 (commit)
       via  a31f1af01651f50765cb60b51e42ba50a9228529 (commit)
      from  d2e73cf7b93a4923fc06e3c9a44a3a99a4a71809 (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=97e5a3856f9ccc5961d813ec689ffdf45d9f2612
commit 97e5a3856f9ccc5961d813ec689ffdf45d9f2612
Merge: d2e73cf a31f1af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 13 14:10:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 13 14:10:17 2013 -0400

    Merge topic 'fix-genex-preprocessing-incomplete-test' into next
    
    a31f1af Comment the test to explain why the elements are there.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a31f1af01651f50765cb60b51e42ba50a9228529
commit a31f1af01651f50765cb60b51e42ba50a9228529
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 13 20:09:36 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 13 20:09:36 2013 +0200

    Comment the test to explain why the elements are there.

diff --git a/Tests/RunCMake/include_directories/incomplete-genex.cmake b/Tests/RunCMake/include_directories/incomplete-genex.cmake
index 64689df..b6900a4 100644
--- a/Tests/RunCMake/include_directories/incomplete-genex.cmake
+++ b/Tests/RunCMake/include_directories/incomplete-genex.cmake
@@ -4,12 +4,20 @@ cmake_policy(SET CMP0022 NEW)
 cmake_policy(SET CMP0023 NEW)
 
 add_library(somelib empty.cpp)
-target_include_directories(somelib PUBLIC
 
-  "/include;/include$<BUILD_INTERFACE:subdir"
+# This test ensures that some internal mechanisms of cmGeneratorExpression
+# do not segfault (#14410).
+
+# Test that cmGeneratorExpression::Preprocess(StripAllGeneratorExpressions)
+# does not segfault
+target_include_directories(somelib PUBLIC
+  "/include;/include/$<BUILD_INTERFACE:subdir"
 )
 
+# Test that cmGeneratorExpression::Preprocess(BuildInterface) does not segfault
 export(TARGETS somelib FILE somelibTargets.cmake)
 
 install(TARGETS somelib EXPORT someExport DESTINATION prefix)
+# Test that cmGeneratorExpression::Preprocess(InstallInterface)
+# and cmGeneratorExpression::Split do not segfault
 install(EXPORT someExport DESTINATION prefix)

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

Summary of changes:
 .../include_directories/incomplete-genex.cmake     |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list