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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/7/head
Michele Calgaro 2 months ago committed by Mavridis Philippe
parent 57f8e4dbf7
commit fd62635a27
No known key found for this signature in database
GPG Key ID: 93F66F98F906147D

@ -8,13 +8,25 @@
# Improvements and feedback are welcome! # # Improvements and feedback are welcome! #
################################################################################ ################################################################################
cmake_minimum_required(VERSION 3.5)
include(TDEL10n) ##### set project version ########################
tde_l10n_auto_add_subdirectories()
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 ############################################### ### create translation templates ###############################################
tde_l10n_create_template( "messages/polyester/" ) tde_l10n_create_template( "messages/polyester/" )
tde_l10n_create_template( tde_l10n_create_template(
@ -25,4 +37,4 @@ tde_l10n_create_template(
color-schemes/PolyesterBlue.kcsrc color-schemes/PolyesterBlue.kcsrc
color-schemes/PolyesterEmerald.kcsrc color-schemes/PolyesterEmerald.kcsrc
color-schemes/PolyesterOrangeJuice.kcsrc color-schemes/PolyesterOrangeJuice.kcsrc
) )

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

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

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

@ -7,26 +7,19 @@
################################################################################ ################################################################################
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIBRARY_DIRS}
) )
### buttons.h ################################################################## ### buttons.h ##################################################################
add_custom_target(buttons.h add_custom_target(buttons.h
COMMAND ${CMAKE_COMMAND} -E create-buttons.sh COMMAND ${CMAKE_COMMAND} -E create-buttons.sh
) )
### twin_polyester_config (kpart) ############################################## ### twin_polyester_config (kpart) ##############################################
tde_add_kpart(twin_polyester_config
AUTOMOC tde_add_kpart( twin_polyester_config AUTOMOC
SOURCES SOURCES
configdialog.ui configdialog.ui

@ -6,9 +6,9 @@
# Improvements and feedback are welcome! # # Improvements and feedback are welcome! #
################################################################################ ################################################################################
foreach (COLOR_SCHEME PolyesterBlue PolyesterEmerald PolyesterOrangeJuice) foreach( COLOR_SCHEME PolyesterBlue PolyesterEmerald PolyesterOrangeJuice)
tde_create_translated_desktop( tde_create_translated_desktop(
SOURCE ${COLOR_SCHEME}.kcsrc SOURCE ${COLOR_SCHEME}.kcsrc
DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes
) )
endforeach() endforeach()

@ -6,4 +6,3 @@
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */ significant byte first (like Motorola and SPARC, unlike Intel). */
#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ #cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

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

@ -7,21 +7,13 @@
################################################################################ ################################################################################
include_directories( include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
${TDE_LIBRARY_DIRS}
) )
### tdestyle_polyester_config (kpart) ########################################## ### tdestyle_polyester_config (kpart) ##########################################
tde_add_kpart(tdestyle_polyester_config
AUTOMOC tde_add_kpart( tdestyle_polyester_config AUTOMOC
SOURCES SOURCES
configdialog.ui configdialog.ui
@ -32,4 +24,4 @@ tde_add_kpart(tdestyle_polyester_config
tdeui-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

Loading…
Cancel
Save