[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-701-gd93b461

[Kitware Robot]

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  d93b461ab27cce861df515a422866bf46a36eee6 (commit)
       via  8187b884717db85a4c413f8a32f72dceff8f9b8a (commit)
      from  fbb4fc817f57fd070cc95772359d64a51258f56c (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=d93b461ab27cce861df515a422866bf46a36eee6
commit d93b461ab27cce861df515a422866bf46a36eee6
Merge: fbb4fc8 8187b88
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 6 19:55:45 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 6 15:55:48 2017 -0400

    Stage topic 'multi-config-no-build-type'
    
    Topic-id: 23489
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/666


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8187b884717db85a4c413f8a32f72dceff8f9b8a
commit 8187b884717db85a4c413f8a32f72dceff8f9b8a
Author:     Bastien Schatt <bastien.schatt at magestik.fr>
AuthorDate: Tue Apr 4 22:11:28 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 6 09:44:34 2017 -0400

    Do not initialize CMAKE_BUILD_TYPE on multi-config generators
    
    Use the `GENERATOR_IS_MULTI_CONFIG` global property to reliably
    detect multi-config generators regardless of what variables the
    project or user have set.

diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake
index 01355ff..f7cf900 100644
--- a/Modules/CMakeASMInformation.cmake
+++ b/Modules/CMakeASMInformation.cmake
@@ -75,11 +75,13 @@ set (CMAKE_ASM${ASM_DIALECT}_FLAGS "${CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT}" CACHE
      "Flags used by the assembler during all build types.")
 
 if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-# default build type is none
-  if(NOT CMAKE_NO_BUILD_TYPE)
+  get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  # default build type is none
+  if(NOT _GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_NO_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
       "Choose the type of build, options are: None, Debug Release RelWithDebInfo MinSizeRel.")
   endif()
+  unset(_GENERATOR_IS_MULTI_CONFIG)
   set (CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG "${CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG_INIT}" CACHE STRING
     "Flags used by the assembler during debug builds.")
   set (CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL "${CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL_INIT}" CACHE STRING
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index 709e316..71aadb4 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -110,11 +110,13 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_INIT}" CACHE STRING
      "Flags used by the compiler during all build types.")
 
 if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-# default build type is none
-  if(NOT CMAKE_NO_BUILD_TYPE)
+  get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  # default build type is none
+  if(NOT _GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_NO_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
       "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
   endif()
+  unset(_GENERATOR_IS_MULTI_CONFIG)
   set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
     "Flags used by the compiler during debug builds.")
   set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
diff --git a/Modules/CMakeCommonLanguageInclude.cmake b/Modules/CMakeCommonLanguageInclude.cmake
index 418860e..43b5da0 100644
--- a/Modules/CMakeCommonLanguageInclude.cmake
+++ b/Modules/CMakeCommonLanguageInclude.cmake
@@ -17,11 +17,13 @@ foreach(t EXE SHARED MODULE STATIC)
 endforeach()
 
 if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-# default build type is none
-  if(NOT CMAKE_NO_BUILD_TYPE)
+  get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  # default build type is none
+  if(NOT _GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_NO_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
       "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
   endif()
+  unset(_GENERATOR_IS_MULTI_CONFIG)
 
   set (CMAKE_EXE_LINKER_FLAGS_DEBUG ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT} CACHE STRING
      "Flags used by the linker during debug builds.")

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

Summary of changes:
 Modules/CMakeASMInformation.cmake        |    6 ++++--
 Modules/CMakeCInformation.cmake          |    6 ++++--
 Modules/CMakeCommonLanguageInclude.cmake |    6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake