From 48c6bba031ea37591a821d9554dd292aee938d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 25 Aug 2018 13:53:12 +0200
Subject: [PATCH] cmake lilo-config: Always add the USE_KDE definition There is
 no reason to build a TQt-only frontend in TDE Fix the names of the auxiliary
 library targets Fix includes folders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 lilo-config/CMakeLists.txt               | 5 +++--
 lilo-config/common/CMakeLists.txt        | 4 ++--
 lilo-config/kde-qt-common/CMakeLists.txt | 8 +++++---
 lilo-config/kde-qt-common/images.cpp     | 4 ++--
 lilo-config/kde/CMakeLists.txt           | 9 +++------
 lilo-config/qt/CMakeLists.txt            | 5 ++++-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lilo-config/CMakeLists.txt b/lilo-config/CMakeLists.txt
index 6ad5ca1..d6f357d 100644
--- a/lilo-config/CMakeLists.txt
+++ b/lilo-config/CMakeLists.txt
@@ -1,6 +1,7 @@
 # This file is genereted by trinity-automake-cmake-convert script by Fat-Zer
 
+add_definitions( -DUSE_KDE )
+
 add_subdirectory( common )
-add_subdirectory( kde )
-#add_subdirectory( qt )
 add_subdirectory( kde-qt-common )
+add_subdirectory( kde )
diff --git a/lilo-config/common/CMakeLists.txt b/lilo-config/common/CMakeLists.txt
index 9db95db..2682ad5 100644
--- a/lilo-config/common/CMakeLists.txt
+++ b/lilo-config/common/CMakeLists.txt
@@ -14,8 +14,8 @@ link_directories(
 )
 
 
-##### common (static) ###########################
+##### liloconfig-common (static) ################
 
-tde_add_library( common STATIC_PIC AUTOMOC
+tde_add_library( liloconfig-common STATIC_PIC AUTOMOC
   SOURCES String.cc Files.cc Disks.cc Config.cc lilo.cc
 )
diff --git a/lilo-config/kde-qt-common/CMakeLists.txt b/lilo-config/kde-qt-common/CMakeLists.txt
index 81e638a..37ee790 100644
--- a/lilo-config/kde-qt-common/CMakeLists.txt
+++ b/lilo-config/kde-qt-common/CMakeLists.txt
@@ -4,6 +4,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/..
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -14,9 +16,9 @@ link_directories(
 )
 
 
-##### widgets (static) ##########################
+##### liloconfig-widgets (static) ###############
 
-tde_add_library( widgets STATIC_PIC AUTOMOC
+tde_add_library( liloconfig-widgets STATIC_PIC AUTOMOC
   SOURCES mainwidget.cpp general.cpp images.cpp expert.cpp EditWidget.cpp
-  LINK common-shared
+  LINK liloconfig-common-static
 )
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index 559b993..8b09749 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -36,8 +36,8 @@
 #include "kde/InputBox.h"
 #include "kde/Details.h"
 #else
-#include "tqt/InputBox.h"
-#include "tqt/Details.h"
+#include "qt/InputBox.h"
+#include "qt/Details.h"
 #endif
 
 Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
diff --git a/lilo-config/kde/CMakeLists.txt b/lilo-config/kde/CMakeLists.txt
index d52d809..3da86ed 100644
--- a/lilo-config/kde/CMakeLists.txt
+++ b/lilo-config/kde/CMakeLists.txt
@@ -4,26 +4,23 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
+  ${CMAKE_CURRENT_SOURCE_DIR}/../kde-qt-common
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/lilo-config/kde-qt-common
-  ${CMAKE_SOURCE_DIR}/lilo-config/common
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${TDE_LIB_DIR}
-  ${CMAKE_SOURCE_DIR}/lilo-config/kde-qt-common
-  ${CMAKE_SOURCE_DIR}/lilo-config/common
 )
 
-add_definitions( -DUSE_KDE )
 
 ##### kcm_lilo (kpart) ##########################
 
 tde_add_kpart( kcm_lilo AUTOMOC
   SOURCES kcontrol.cpp Details.cpp InputBox.cpp
-  LINK tdeio-shared tdecore-shared tdeui-shared
+  LINK liloconfig-widgets-static tdeio-shared tdecore-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/lilo-config/qt/CMakeLists.txt b/lilo-config/qt/CMakeLists.txt
index 4e8c303..c079059 100644
--- a/lilo-config/qt/CMakeLists.txt
+++ b/lilo-config/qt/CMakeLists.txt
@@ -4,6 +4,8 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../common
+  ${CMAKE_CURRENT_SOURCE_DIR}/../kde-qt-common
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -16,6 +18,7 @@ link_directories(
 ##### lilo-config (executable) ##################
 
 tde_add_executable( lilo-config AUTOMOC
-  SOURCES 
+  SOURCES standalone.cpp Details.cpp InputBox.cpp
+  LINK liloconfig-widgets-static
   DESTINATION ${BIN_INSTALL_DIR}
 )