From 26459763e5f21733cb701bf9ddd6feed29fa7df8 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 31 Oct 2018 19:41:52 +0100 Subject: [PATCH] Only set QtDebugMsg when build type is debug --- CMakeLists.txt | 13 ++++++++----- src/config.h.in | 2 ++ src/core/main.cpp | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c037f3992..b6a7908de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,24 +35,27 @@ include(cmake/Rpm.cmake) include(cmake/Deb.cmake) if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(LINUX 1) + set(LINUX ON) endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - set(FREEBSD 1) + set(FREEBSD ON) endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") - set(OPENBSD 1) + set(OPENBSD ON) endif() set(CMAKE_CXX_STANDARD 11) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -#set(CMAKE_BUILD_TYPE Debug) if(${CMAKE_BUILD_TYPE} MATCHES "Release") add_definitions(-DNDEBUG) add_definitions(-DQT_NO_DEBUG_OUTPUT) #add_definitions(-DQT_NO_WARNING_OUTPUT) -endif(${CMAKE_BUILD_TYPE} MATCHES "Release") +endif() + +if(${CMAKE_BUILD_TYPE} MATCHES "Debug") + set(DEBUG ON) +endif() if (CMAKE_CXX_COMPILER MATCHES ".*clang") set(CMAKE_COMPILER_IS_CLANGXX 1) diff --git a/src/config.h.in b/src/config.h.in index 27b7fc8bd..c21582956 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -20,9 +20,11 @@ #ifndef CONFIG_H_IN #define CONFIG_H_IN +#define CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define CMAKE_EXECUTABLE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}" +#cmakedefine DEBUG #cmakedefine HAVE_GIO #cmakedefine HAVE_DBUS #cmakedefine HAVE_X11 diff --git a/src/core/main.cpp b/src/core/main.cpp index 4c3c04563..d511b1b24 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -203,7 +203,9 @@ int main(int argc, char* argv[]) { Q_INIT_RESOURCE(data); Q_INIT_RESOURCE(icons); +#ifdef DEBUG QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true); +#endif Application app;