diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-25 13:53:12 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-09-01 18:41:35 +0200 |
| commit | 48c6bba031ea37591a821d9554dd292aee938d58 (patch) | |
| tree | 1ab8379458f490e75bfc5bac3696cf3c8c9c29db /lilo-config/kde-qt-common | |
| parent | 78e39d59137bcfe1a90e53e8f4c0342d8e0939fd (diff) | |
| download | tdeadmin-48c6bba031ea37591a821d9554dd292aee938d58.tar.gz tdeadmin-48c6bba031ea37591a821d9554dd292aee938d58.zip | |
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
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'lilo-config/kde-qt-common')
| -rw-r--r-- | lilo-config/kde-qt-common/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lilo-config/kde-qt-common/images.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
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) |