From ec30f6856c2356b4eb5a0aa7a2119947b7304820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 12 Feb 2019 21:51:29 +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 (cherry picked from commit b9b7a0b31581b881c6ae8877aff3695c08390172) --- CMakeLists.txt | 1 + ConfigureChecks.cmake | 43 +++++++++++++++---------------------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b8419f..8a201eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ project( konversation ) ##### include essential cmake modules ########### include( FindPkgConfig ) +include( CheckSymbolExists ) include( CheckIncludeFile ) include( CheckLibraryExists ) # @Add othere required cmake modules here@ diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index df74bc5..5794538 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,21 +9,25 @@ # ################################################# + +# 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 ######### -# FIXME -# This should check for [T]Qt3 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( WITH_GCC_VISIBILITY ) - + tde_setup_gcc_visibility( ) +endif( ) -tde_setup_architecture_flags( ) # XScreenSaver if( BUILD_KONVERSATION AND WITH_XSCREENSAVER ) @@ -34,20 +38,3 @@ if( BUILD_KONVERSATION AND WITH_XSCREENSAVER ) tde_message_fatal( "xscreensaver is requested, but was not found on your system" ) endif( ) endif( BUILD_KONVERSATION AND WITH_XSCREENSAVER ) - -# gettext -if( BUILD_TRANSLATIONS ) - include( FindGettext ) - if( GETTEXT_FOUND ) - set( MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT_EXECUTABLE} - CACHE FILEPATH "path to msgfmt executable" ) - endif( GETTEXT_FOUND ) - - if( NOT MSGFMT_EXECUTABLE ) - tde_message_fatal( "msgfmt is required but was not found on your system." ) - endif( NOT MSGFMT_EXECUTABLE ) -endif( BUILD_TRANSLATIONS ) - -# required stuff -find_package( TQt ) -find_package( TDE )