[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3574-g97ef2d8

Ben Boeckel ben.boeckel at kitware.com
Thu Jun 5 12:43:44 EDT 2014


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  97ef2d89293276e90083868347ca13b5f233643b (commit)
       via  7db77a828a3c79c5dce476b78e759478756ca091 (commit)
      from  97ef74ea760b23ef6a7d32038477a59d5fb14fb9 (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=97ef2d89293276e90083868347ca13b5f233643b
commit 97ef2d89293276e90083868347ca13b5f233643b
Merge: 97ef74e 7db77a8
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jun 5 12:43:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 12:43:43 2014 -0400

    Merge topic 'dev/fix-complex-tests' into next
    
    7db77a82 tests: allow RelWithDebInfo and MinSizeRel configs to work


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7db77a828a3c79c5dce476b78e759478756ca091
commit 7db77a828a3c79c5dce476b78e759478756ca091
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jun 5 12:42:13 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jun 5 12:42:13 2014 -0400

    tests: allow RelWithDebInfo and MinSizeRel configs to work

diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 5fa46bf..222250c 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -83,6 +83,14 @@ set_property(DIRECTORY
   PROPERTY COMPILE_DEFINITIONS_RELEASE
   CMAKE_IS_FUN_IN_RELEASE_MODE
   )
+set_property(DIRECTORY
+  PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO
+  CMAKE_IS_FUN_IN_RELEASE_MODE
+  )
+set_property(DIRECTORY
+  PROPERTY COMPILE_DEFINITIONS_MINSIZEREL
+  CMAKE_IS_FUN_IN_RELEASE_MODE
+  )
 
 set(TEST_SEP "a b c")
 separate_arguments(TEST_SEP)
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index d3d9132..3f17dcc 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -83,6 +83,14 @@ set_property(DIRECTORY
   PROPERTY COMPILE_DEFINITIONS_RELEASE
   CMAKE_IS_FUN_IN_RELEASE_MODE
   )
+set_property(DIRECTORY
+  PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO
+  CMAKE_IS_FUN_IN_RELEASE_MODE
+  )
+set_property(DIRECTORY
+  PROPERTY COMPILE_DEFINITIONS_MINSIZEREL
+  CMAKE_IS_FUN_IN_RELEASE_MODE
+  )
 
 set(TEST_SEP "a b c")
 separate_arguments(TEST_SEP)

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

Summary of changes:
 Tests/Complex/CMakeLists.txt          |    8 ++++++++
 Tests/ComplexOneConfig/CMakeLists.txt |    8 ++++++++
 2 files changed, 16 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list