[arrow] branch master updated: ARROW-5414: [C++] default to release build on windows

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 248f2ce  ARROW-5414: [C++] default to release build on windows
248f2ce is described below

commit 248f2ce87daa50c752d66e816deaad1e4900416e
Author: Benjamin Kietzman <be...@gmail.com>
AuthorDate: Thu Aug 1 17:53:17 2019 -0500

    ARROW-5414: [C++] default to release build on windows
    
    Previously windows defaulted to debug, see https://gitlab.kitware.com/cmake/cmake/issues/19401#note_585591
    
    Closes #4986 from bkietz/5414-windows-default-build-type and squashes the following commits:
    
    47ca2f740 <Benjamin Kietzman> default to release build on windows
    
    Authored-by: Benjamin Kietzman <be...@gmail.com>
    Signed-off-by: Wes McKinney <we...@apache.org>
---
 cpp/CMakeLists.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index a9f8922..15e7ebf 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -22,12 +22,13 @@ set(ARROW_VERSION "1.0.0-SNAPSHOT")
 
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")
 
-project(arrow VERSION "${ARROW_BASE_VERSION}")
-
 # if no build build type is specified, default to release builds
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
-endif(NOT CMAKE_BUILD_TYPE)
+get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(NOT GENERATOR_IS_MULTI_CONFIG AND NOT DEFINED CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build.")
+endif()
+
+project(arrow VERSION "${ARROW_BASE_VERSION}")
 
 set(ARROW_VERSION_MAJOR "${arrow_VERSION_MAJOR}")
 set(ARROW_VERSION_MINOR "${arrow_VERSION_MINOR}")