[Cmake-commits] CMake branch, next, updated. v3.7.2-2379-g75650c6

[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  75650c68024ad5d9d3374e197d5fdec5ae9406aa (commit)
       via  f01045ea36621fbc66a87bb041cd403d47304211 (commit)
      from  ad64b91c25208a5b27f49cef201ae155aae3cd9e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75650c68024ad5d9d3374e197d5fdec5ae9406aa
commit 75650c68024ad5d9d3374e197d5fdec5ae9406aa
Merge: ad64b91 f01045e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 27 09:17:38 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 09:17:38 2017 -0500

    Merge topic 'test-preprocess-configs' into next
    
    f01045ea Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f01045ea36621fbc66a87bb041cd403d47304211
commit f01045ea36621fbc66a87bb041cd403d47304211
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Thu Jan 26 15:34:24 2017 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 27 09:09:15 2017 -0500

    Tests: Make Preprocess test work in RelWithDebInfo and MinSizeRel

diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index 15f0338..807a427 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -214,18 +214,24 @@ set(FILE_PATH "${Preprocess_SOURCE_DIR}/file_def.h")
 set(TARGET_PATH "${Preprocess_SOURCE_DIR}/target_def.h")
 
 # Set some definition properties.
-foreach(c "" "_DEBUG" "_RELEASE")
+foreach(c "" "_DEBUG" "_RELEASE" "_RELWITHDEBINFO" "_MINSIZEREL")
+  set(FLAVOR "${c}")
+  # Treat RelWithDebInfo and MinSizeRel as Release to avoid having
+  # an exponentional matrix of inclusions and exclusions of defines
+  if("${c}" STREQUAL "_RELWITHDEBINFO" OR "${c}" STREQUAL "_MINSIZEREL")
+    set(FLAVOR "_RELEASE")
+  endif()
   set_property(
     DIRECTORY .
-    APPEND PROPERTY COMPILE_DEFINITIONS${c} "DIRECTORY_DEF${c}"
+    APPEND PROPERTY COMPILE_DEFINITIONS${c} "DIRECTORY_DEF${FLAVOR}"
     )
   set_property(
     TARGET Preprocess
-    PROPERTY COMPILE_DEFINITIONS${c} "TARGET_DEF${c}"
+    PROPERTY COMPILE_DEFINITIONS${c} "TARGET_DEF${FLAVOR}"
     )
   set_property(
     SOURCE preprocess.c preprocess.cxx
-    PROPERTY COMPILE_DEFINITIONS${c} "FILE_DEF${c}"
+    PROPERTY COMPILE_DEFINITIONS${c} "FILE_DEF${FLAVOR}"
     )
 endforeach()
 

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

Summary of changes:
 Tests/Preprocess/CMakeLists.txt |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake