From b0c2717fd80109aa418e75298d66b6053fc6666e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 29 Jan 2019 12:40:35 +0100 Subject: [PATCH] Update CMake rules + Add WITH_GCC_VISIBILITY option + Use common tde_setup_gcc_visibility + Add TestBigEndian and tde_setup_largefiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 5 +++-- ConfigureChecks.cmake | 14 ++++++++++++++ akode/lib/CMakeLists.txt | 4 ---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df5b7ea..8819d46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ ################################################# # -# (C) 2015 Slávek Banko +# (C) 2015-2019 Slávek Banko # slavek (DOT) banko (AT) axis.cz # # Improvements and feedback are welcome @@ -24,6 +24,7 @@ set( VERSION 2.0.2 ) include( FindPkgConfig ) include( CheckCXXSourceCompiles ) include( CheckFunctionExists ) +include( CheckSymbolExists ) include( CheckIncludeFile ) include( CheckLibraryExists ) @@ -32,7 +33,6 @@ include( CheckLibraryExists ) set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) -tde_setup_architecture_flags( ) ##### setup install paths ####################### @@ -45,6 +45,7 @@ tde_setup_paths( ) option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) OPTION( WITH_LIBLTDL "Build with libltdl" ${WITH_ALL_OPTIONS} ) OPTION( WITH_ALSA_SINK "Build with alsa sink" ${WITH_ALL_OPTIONS} ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 743aa72..ea07330 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -10,6 +10,20 @@ ################################################# +# required stuff + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( ) + + ##### check for system libraries ################ if( WITH_LIBLTDL ) diff --git a/akode/lib/CMakeLists.txt b/akode/lib/CMakeLists.txt index 9ecb472..2f61fa1 100644 --- a/akode/lib/CMakeLists.txt +++ b/akode/lib/CMakeLists.txt @@ -15,10 +15,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -if( UNIX ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden" ) - set( __KDE_HAVE_GCC_VISIBILITY 1 ) -endif( UNIX ) configure_file( akode_export.h.cmake akode_export.h @ONLY )