From 147523ef361e25bc14c1ff4f452bfd017c5f7385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 15 Feb 2019 16:59:13 +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 | 23 +++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1f7e42..d2ef19b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,9 @@ set( TDENETWORKMANAGER_VERSION "0.9" ) ##### 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 ae4517f..f3dfb85 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,26 +9,21 @@ # ################################################# + # required stuff +find_package( TQt ) +find_package( TDE ) + tde_setup_architecture_flags( ) include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) -find_package( TQt ) -find_package( TDE ) - +tde_setup_largefiles( ) -##### gettext -if( BUILD_TRANSLATIONS ) - include( FindGettext ) - if( GETTEXT_FOUND ) - set( MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT_EXECUTABLE} - CACHE FILEPATH "path to msgfmt executable" ) - endif( GETTEXT_FOUND ) +##### check for gcc visibility support - if( NOT MSGFMT_EXECUTABLE ) - tde_message_fatal( "msgfmt is required but was not found on your system." ) - endif( NOT MSGFMT_EXECUTABLE ) -endif( BUILD_TRANSLATIONS ) +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY )