diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-27 02:57:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-27 02:59:36 +0300 |
commit | e6be5b8a2cdbfb9e62ef6bed83da841846cdfd1e (patch) | |
tree | 83311b2dce654f76858888ae640baf661d55210c /CMakeLists.txt | |
parent | 03b46f7941e17906b193db39f1ff4339b02b58c6 (diff) | |
parent | b796ce0f26c1bf206194eb8c004d214806c2828b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3da27fb52d5..3adf5825fa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/platform") # avoid having empty buildtype -set(CMAKE_BUILD_TYPE_INIT "Release") +if(NOT DEFINED CMAKE_BUILD_TYPE_INIT) + set(CMAKE_BUILD_TYPE_INIT "Release") +endif() # quiet output for Makefiles, 'make -s' helps too # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) |