From f5dd4b1e8d22437603cc7c4f481bdd2a02500750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 1 Jul 2021 19:18:31 +0200 Subject: [PATCH] Conversion to the cmake building system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 83 +++++++++++++++++++++++++++++++++ ConfigureChecks.cmake | 25 ++++++++++ client/CMakeLists.txt | 48 +++++++++++++++++++ client/config/CMakeLists.txt | 29 ++++++++++++ client/config/crystalconfig.cpp | 4 +- client/crystalclient.cpp | 7 ++- client/imageholder.cpp | 2 + config.h.cmake | 8 ++++ pics/CMakeLists.txt | 48 +++++++++++++++++++ 9 files changed, 250 insertions(+), 4 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 ConfigureChecks.cmake create mode 100644 client/CMakeLists.txt create mode 100644 client/config/CMakeLists.txt create mode 100644 config.h.cmake create mode 100644 pics/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..4942b6b --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,83 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8.12 ) + + +#### general package setup + +project( twin-style-crystal ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + + +#### include our cmake modules + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( client ) +add_subdirectory( pics ) + + +##### other data + +#tde_conditional_add_project_docs( BUILD_DOC ) +#tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..d1e3778 --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,25 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt new file mode 100644 index 0000000..1cbaac3 --- /dev/null +++ b/client/CMakeLists.txt @@ -0,0 +1,48 @@ +tde_import( twin ) + +add_subdirectory( config ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/pics + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIBRARY_DIRS} +) + + +##### twin3_crystal (kpart) + +tde_add_kpart( twin3_crystal AUTOMOC + + SOURCES + buttonimage.cpp + crystalbutton.cpp + crystalclient.cpp + imageholder.cpp + myrootpixmap.cpp + LINK + tdecore-shared + tdeui-shared + tdecorations-shared + + DEPENDENCIES + embed-tiles + embed-overlays + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE crystal.desktop + DESTINATION ${DATA_INSTALL_DIR}/twin +) diff --git a/client/config/CMakeLists.txt b/client/config/CMakeLists.txt new file mode 100644 index 0000000..236d683 --- /dev/null +++ b/client/config/CMakeLists.txt @@ -0,0 +1,29 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIBRARY_DIRS} +) + + +##### twin_crystal_config (kpart) + +tde_add_kpart( twin_crystal_config AUTOMOC + + SOURCES + crystalconfig.cpp + configdialog.ui + infodialog.ui + LINK + tdecore-shared + tdeui-shared + tdeio-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/client/config/crystalconfig.cpp b/client/config/crystalconfig.cpp index 117aafc..85f0d9d 100644 --- a/client/config/crystalconfig.cpp +++ b/client/config/crystalconfig.cpp @@ -155,7 +155,7 @@ void CrystalConfig::load(TDEConfig*) config_->setGroup("General"); TQString value = config_->readEntry("TitleAlignment", "AlignHCenter"); - TQRadioButton *button = (TQRadioButton*)dialog_->titlealign->child(value); + TQRadioButton *button = (TQRadioButton*)dialog_->titlealign->child(value.utf8()); if (button) button->setChecked(true); dialog_->drawCaption->setChecked(config_->readBoolEntry("DrawCaption",true)); @@ -376,7 +376,7 @@ void CrystalConfig::defaults() extern "C" { - TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new CrystalConfig(config, parent)); } } diff --git a/client/crystalclient.cpp b/client/crystalclient.cpp index 90b3429..08483fd 100644 --- a/client/crystalclient.cpp +++ b/client/crystalclient.cpp @@ -54,9 +54,12 @@ bool CrystalFactory::initialized_ = false; TQt::AlignmentFlags CrystalFactory::titlealign_ = TQt::AlignHCenter; -extern "C" KDecorationFactory* create_factory() +extern "C" { - return new CrystalFactory(); + KDE_EXPORT KDecorationFactory* create_factory() + { + return new CrystalFactory(); + } } diff --git a/client/imageholder.cpp b/client/imageholder.cpp index 8d8934f..b3c2a50 100644 --- a/client/imageholder.cpp +++ b/client/imageholder.cpp @@ -169,3 +169,5 @@ void QImageHolder::BackgroundUpdated(const TQImage *src) emit repaintNeeded(); } + +#include "imageholder.moc" diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..61ede3a --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,8 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt new file mode 100644 index 0000000..8246b0c --- /dev/null +++ b/pics/CMakeLists.txt @@ -0,0 +1,48 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIBRARY_DIRS} +) + + +##### embedtool (executable) + +tde_add_executable( embedtool AUTOMOC + + SOURCES + embedtool.cpp + LINK + ${TQT_LIBRARIES} +) + + +##### generate embeded images + +file( GLOB images */*.png ) + +add_custom_command( + OUTPUT tiles.h + COMMAND embedtool ${images} > tiles.h + COMMENT "Generating Button Themes..." +) + +add_custom_target( embed-tiles DEPENDS tiles.h ) + + +file( GLOB overlays *overlay.png ) + +add_custom_command( + OUTPUT overlays.h + COMMAND embedtool ${overlays} > overlays.h + COMMENT "Generating Overlays..." +) + +add_custom_target( embed-overlays DEPENDS overlays.h )