From df8210279872ef04508fd6fe408f8ea03abcd39e Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 16 Mar 2023 09:41:53 +0300 Subject: [PATCH] cmake fixes --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d8d0e10..ab09553d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,12 +61,17 @@ if((NOT DEFINED WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT DEFINED APPLE endif() set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "") +if (CMAKE_BUILD_TYPE MATCHES Debug) + set(PIP_BUILD_DEBUG ON) +else() + set(PIP_BUILD_DEBUG OFF) +endif() # Options option(ICU "ICU support for convert codepages" ${_ICU_DEFAULT}) option(STD_IOSTREAM "Building with std iostream operators support" OFF) option(INTROSPECTION "Build with introspection" OFF) -option(TESTS "Build tests and perform their before install step" OFF) +option(TESTS "Build tests and perform their before install step" ${PIP_BUILD_DEBUG}) option(COVERAGE "Build project with coverage info" OFF) set(PIP_UTILS 1) set(BUILDING_pip 1 PARENT_SCOPE) @@ -255,12 +260,10 @@ CHECK_FUNCTION_EXISTS(timer_delete PIP_TIMER_RT_2) # Check if build debug version -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(PIP_BUILD_TYPE "Debug") +if (PIP_BUILD_DEBUG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall") add_definitions(-DPIP_DEBUG) else() - set(PIP_BUILD_TYPE "Release") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall") endif() @@ -657,7 +660,7 @@ list(REMOVE_ITEM LIBS_STATUS ${PIP_MODULES}) message("----------PIP----------") message(" Version: ${PIP_VERSION} ") message(" Linkage: ${PIP_LIB_TYPE_MSG}") -message(" Type : ${PIP_BUILD_TYPE}") +message(" Type : ${CMAKE_BUILD_TYPE}") if (NOT LOCAL) message(" Install: \"${CMAKE_INSTALL_PREFIX}\"") else()