aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-24 22:22:57 +0200
committerMontel Laurent <[email protected]>2015-08-24 22:22:57 +0200
commitc8ba0377b5b9fc05955941ff3ae01ded28a1081e (patch)
tree3acdd86e15ade144b7acc49c6fd7c7a609171228
parentc8c590a3b3a672f155770e0d778af5c175e90a1e (diff)
Use new macro
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/kcalutils_debug.cpp22
-rw-r--r--src/kcalutils_debug.h27
4 files changed, 3 insertions, 52 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96e56a..d145b6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
project(KCalUtils)
# ECM setup
-find_package(ECM 5.12.0 CONFIG REQUIRED)
+find_package(ECM 5.14.0 CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(ECMGenerateHeaders)
@@ -14,7 +14,7 @@ include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings)
-
+include(ECMQtDeclareLoggingCategory)
set(KF5_VERSION "5.12.0")
set(CALENDARUTILS_LIB_VERSION "4.80.0")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85bc51f..0d7bdcc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,8 +7,8 @@ set(kcalutils_SRCS
scheduler.cpp
vcaldrag.cpp
dndfactory.cpp
- kcalutils_debug.cpp
)
+ecm_qt_declare_logging_category(kcalutils_SRCS HEADER kcalutils_debug.h IDENTIFIER KCALUTILS_LOG CATEGORY_NAME log_kcalutils)
kconfig_add_kcfg_files(kcalutils_SRCS htmlexportsettings.kcfgc)
diff --git a/src/kcalutils_debug.cpp b/src/kcalutils_debug.cpp
deleted file mode 100644
index be1c27c..0000000
--- a/src/kcalutils_debug.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2014 Laurent Montel <[email protected]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "kcalutils_debug.h"
-Q_LOGGING_CATEGORY(KCALUTILS_LOG, "log_kcalutils")
-
diff --git a/src/kcalutils_debug.h b/src/kcalutils_debug.h
deleted file mode 100644
index feb18fc..0000000
--- a/src/kcalutils_debug.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2014 Laurent Montel <[email protected]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KCALUTILS_DEBUG_H
-#define KCALUTILS_DEBUG_H
-
-#include <QLoggingCategory>
-Q_DECLARE_LOGGING_CATEGORY(KCALUTILS_LOG)
-
-#endif
-