From cd1471858e29d0d23355a93178e063fd0550d31c Mon Sep 17 00:00:00 2001
From: gregory guy <gregory-tde@laposte.net>
Date: Thu, 16 Jul 2020 14:07:49 +0200
Subject: Conversion to the cmake building system. Added a man page taken from
 the Debian packaging system.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gregory guy <gregory-tde@laposte.net>

Resolve issues that occurred during CMake conversion.
Concatenate the commands for generating pixmaps.h with CMake
so that there is no need to use the GNU specific sed option -i.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit d0c03cc9a910ea44cea57b1af43bbd90eb86d4bc)
---
 style/utils.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'style/utils.cpp')

diff --git a/style/utils.cpp b/style/utils.cpp
index e39b5b0..aaa8a6e 100644
--- a/style/utils.cpp
+++ b/style/utils.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "baghira.h"
 
 #include <tqbitmap.h>
@@ -12,8 +16,6 @@
 //#include <kwordwrap.h>
 
 
-#include "config.h"
-
 #ifndef CLAMP
 #define CLAMP(x,l,u) x < l ? l :\
    x > u ? u :\
-- 
cgit v1.2.1