From 90a4dab501ce11947981c92af85106dec98ca7ba Mon Sep 17 00:00:00 2001 From: Date: Thu, 17 Aug 2017 00:35:54 +1000 Subject: [PATCH] Let CMake deal with build type. --- CMakeLists.txt | 17 ----------------- cmake/system.cmake | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a91ea5ff7..4575fd390 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,6 @@ if(MSVC) option(BUILD_WITHOUT_LAPACK "Without LAPACK and LAPACKE (Only BLAS or CBLAS)" ON) endif() option(BUILD_WITHOUT_CBLAS "Without CBLAS" OFF) -option(BUILD_DEBUG "Build Debug Version" OFF) option(DYNAMIC_ARCH "Build with DYNAMIC_ARCH" OFF) ####### if(BUILD_WITHOUT_LAPACK) @@ -34,22 +33,6 @@ set(NO_LAPACK 1) set(NO_LAPACKE 1) endif() -if(CMAKE_CONFIGURATION_TYPES) # multiconfig generator? - set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE) - set(CMAKE_BUILD_TYPE - Debug Debug - Release Release - ) -else() - if( NOT CMAKE_BUILD_TYPE ) - if(BUILD_DEBUG) - set(CMAKE_BUILD_TYPE Debug) - else() - set(CMAKE_BUILD_TYPE Release) - endif() - endif() -endif() - if(BUILD_WITHOUT_CBLAS) set(NO_CBLAS 1) endif() diff --git a/cmake/system.cmake b/cmake/system.cmake index 3d3270778..5fe9081ac 100644 --- a/cmake/system.cmake +++ b/cmake/system.cmake @@ -52,7 +52,7 @@ if (NO_AVX2) set(GETARCH_FLAGS "${GETARCH_FLAGS} -DNO_AVX2") endif () -if (CMAKE_BUILD_TYPE STREQUAL Debug) +if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(GETARCH_FLAGS "${GETARCH_FLAGS} -g") endif () @@ -316,7 +316,7 @@ set(SED sed) set(REVISION "-r${OpenBLAS_VERSION}") set(MAJOR_VERSION ${OpenBLAS_MAJOR_VERSION}) -if (DEBUG) +if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(COMMON_OPT "${COMMON_OPT} -g") endif ()