From 27a08b92d00e1a168f4484bf5ec42294a03a847e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 15 Feb 2019 16:59:55 +0100 Subject: [PATCH] Use common CMake tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 3 ++- ConfigureChecks.cmake | 39 ++++++++++++++++----------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9b246d..8839c90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,9 @@ project( tdepowersave ) ##### include essential cmake modules ########### -include( CheckCXXSourceCompiles ) include( FindPkgConfig ) +include( CheckSymbolExists ) +include( CheckCXXSourceCompiles ) ##### include our cmake modules ################# diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 4e77ea1..961fd49 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,18 +9,24 @@ # ################################################# -##### check for gcc visibility support ######### -# FIXME -# This should check for [T]Qt3 visibility support + +# 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 ) - if( NOT UNIX ) - tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" ) - endif( NOT UNIX ) - set( __KDE_HAVE_GCC_VISIBILITY 1 ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") -endif( ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) # check for Xext @@ -56,16 +62,3 @@ pkg_search_module( DBUS_TQT dbus-1-tqt ) if( NOT DBUS_TQT_FOUND ) tde_message_fatal( "dbus-1-tqt is required, but was not found on your system" ) endif( ) - -# check for msgfmt -if( BUILD_TRANSLATIONS AND NOT DEFINED MSGFMT_EXECUTABLE ) - find_program( MSGFMT_EXECUTABLE msgfmt ) - if( NOT MSGFMT_EXECUTABLE ) - tde_message_fatal( "msgfmt program is required, but was not found on your system" ) - endif( ) -endif( ) - - -# required stuff -find_package( TQt ) -find_package( TDE )