Use centralized cmake version. Align cmake files to usual TDE style

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

CMakeL10n.txt

@@ -8,13 +8,25 @@
 #  Improvements and feedback are welcome!                                      #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.5)
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+
+
+##### include our cmake modules #################
 
 include( TDEL10n )
+
+
+##### create translation templates ##############
+
 tde_l10n_auto_add_subdirectories( )
 
 
 ### create translation templates ###############################################
+
 tde_l10n_create_template( "messages/polyester/" )
 
 tde_l10n_create_template(

CMakeLists.txt

@@ -6,12 +6,21 @@
 #  Improvements and feedback are welcome!                                      #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.5)
 
-### general package setup ######################################################
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
+
+
+##### general package setup
+
 project( tde-style-polyester )
 
-### essential cmake modules ####################################################
+
+##### include essential cmake modules
+
 include( FindPkgConfig          )
 include( CheckFunctionExists    )
 include( CheckSymbolExists      )
@@ -20,37 +29,51 @@ include(CheckLibraryExists)
 include( CheckCSourceCompiles   )
 include( CheckCXXSourceCompiles )
 
-### TDE modules ################################################################
+
+##### include our cmake modules
+
 include( TDEMacros )
-tde_set_project_version()
+
+
+##### setup install paths
 
 include( TDESetupPaths )
 tde_setup_paths( )
 
-### optional support ###########################################################
+
+##### optional stuff
+
 option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
-option(WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-       ${WITH_ALL_OPTIONS})
+
+
+##### user requested modules
 
-### user requested modules #####################################################
 option(	BUILD_ALL             "Build all" ON )
 option(	BUILD_TWIN_DECORATION "Build window decoration for twin" ${BUILD_ALL} )
 option(	BUILD_WIDGET_STYLE    "Build widget style"               ${BUILD_ALL} )
 option(	BUILD_COLOR_SCHEMES   "Install color schemes"            ${BUILD_ALL} )
 
-### configure checks ###########################################################
+##### configure checks
+
 include( ConfigureChecks.cmake )
 
-### compiler settings ##########################################################
+
+###### 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" )
 
-### subdirectories #############################################################
+
+##### directories
+
 tde_conditional_add_subdirectory( BUILD_TWIN_DECORATION client )
 tde_conditional_add_subdirectory( BUILD_WIDGET_STYLE style )
 tde_conditional_add_subdirectory( BUILD_COLOR_SCHEMES color-schemes )
 
-### write configuration ########################################################
+##### write configure files
+
 configure_file( config.h.cmake config.h @ONLY )

ConfigureChecks.cmake

@@ -6,10 +6,11 @@
 #  Improvements and feedback are welcome!                                      #
 ################################################################################
 
-### TQt/TDE ####################################################################
 
+# required stuff
 find_package( TQt )
 find_package( TDE )
+
 tde_setup_architecture_flags( )
 
 include(TestBigEndian)
@@ -17,7 +18,9 @@ test_big_endian(WORDS_BIGENDIAN)
 
 tde_setup_largefiles( )
 
-### GCC visibility #############################################################
+
+##### check for gcc visibility support
+
 if( WITH_GCC_VISIBILITY )
   tde_setup_gcc_visibility( )
-endif()
+endif( WITH_GCC_VISIBILITY )

client/CMakeLists.txt

@@ -22,8 +22,8 @@ link_directories(
 tde_import(twin)
 
 ### twin_polyester (kpart) #####################################################
-tde_add_kpart(twin_polyester
+
-  AUTOMOC
+tde_add_kpart( twin_polyester AUTOMOC
 
   SOURCES
     polyester.cpp
@@ -39,10 +39,12 @@ tde_add_kpart(twin_polyester
 )
 
 ### other data #################################################################
+
 install(
   FILES polyester.desktop
   DESTINATION ${DATA_INSTALL_DIR}/twin
 )
 
 ### configuration module #######################################################
+
 add_subdirectory(config)

client/config/CMakeLists.txt

@@ -7,26 +7,19 @@
 ################################################################################
 
 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}
 )
 
 ### buttons.h ##################################################################
+
 add_custom_target(buttons.h
   COMMAND ${CMAKE_COMMAND} -E create-buttons.sh
 )
 
 ### twin_polyester_config (kpart) ##############################################
-tde_add_kpart(twin_polyester_config
+
-  AUTOMOC
+tde_add_kpart( twin_polyester_config AUTOMOC
 
   SOURCES
     configdialog.ui

config.h.cmake

@@ -6,4 +6,3 @@
 /* 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@
-

style/CMakeLists.txt

@@ -19,9 +19,10 @@ link_directories(
   ${TDE_LIBRARY_DIRS}
 )
 
+
 ### polyester (kpart) ##########################################################
-tde_add_kpart(polyester
+
-  AUTOMOC
+tde_add_kpart( polyester AUTOMOC
 
   SOURCES
     polyester.cpp
@@ -33,10 +34,14 @@ tde_add_kpart(polyester
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
 )
 
+
 ### configuration module #######################################################
+
 add_subdirectory(config)
 
+
 ### other data #################################################################
+
 install(
   FILES polyester.themerc
   DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes

style/config/CMakeLists.txt

@@ -7,21 +7,13 @@
 ################################################################################
 
 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}
 )
 
 ### tdestyle_polyester_config (kpart) ##########################################
-tde_add_kpart(tdestyle_polyester_config
+
-  AUTOMOC
+tde_add_kpart( tdestyle_polyester_config AUTOMOC
 
   SOURCES
     configdialog.ui