From d2d1611f990dd416a8025cdec645f72f01c4cbf8 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 24 Apr 2021 22:41:38 +0300 Subject: [PATCH] replace compiler flag checks with CMake variables Signed-off-by: Ivailo Monev --- CMakeLists.txt | 22 +++------------------- src/CMakeLists.txt | 26 -------------------------- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9fe2c2..fc45d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,9 @@ project(dbusmenu-qt) cmake_minimum_required(VERSION 3.0.2) set(CMAKE_AUTOMOC TRUE) -set(CMAKE_AUTOUIC TRUE) -set(CMAKE_AUTORCC TRUE) +set(CMAKE_C_VISIBILITY_PRESET "hidden") +set(CMAKE_CXX_VISIBILITY_PRESET "hidden") +set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) # Build options option(WITH_DOC "Build documentation (requires Doxygen)" ON) @@ -25,23 +26,6 @@ add_definitions(${QT_DEFINITIONS}) set(QT_SUFFIX "katie") -include (CheckCXXCompilerFlag) -# Check some compiler flags -check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY) -if (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") -endif (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32) - -check_cxx_compiler_flag(-Woverloaded-virtual __DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL) -if (__DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") -endif (__DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL) - -check_cxx_compiler_flag(-std=c++11 __DBUSMENU_HAVE_CXX11) -if (__DBUSMENU_HAVE_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif (__DBUSMENU_HAVE_CXX11) - include(GNUInstallDirs) set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}") set(INCLUDE_INSTALL_DIR "include/dbusmenu-${QT_SUFFIX}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 29f0450..67ae9e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,31 +1,5 @@ include(CheckCXXSourceCompiles) -check_cxx_compiler_flag(-Wall __DBUSMENU_HAVE_W_ALL) -if (__DBUSMENU_HAVE_W_ALL) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -endif (__DBUSMENU_HAVE_W_ALL) - -# Check some compiler flags -check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY) -if (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") -endif (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32) - -check_cxx_compiler_flag(-Woverloaded-virtual __DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL) -if (__DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") -endif (__DBUSMENU_HAVE_W_OVERLOADED_VIRTUAL) - -check_cxx_compiler_flag(-Wall __DBUSMENU_HAVE_W_ALL) -if (__DBUSMENU_HAVE_W_ALL) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -endif (__DBUSMENU_HAVE_W_ALL) - -check_cxx_compiler_flag(-std=c++11 __DBUSMENU_HAVE_CXX11) -if (__DBUSMENU_HAVE_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif (__DBUSMENU_HAVE_CXX11) - # Check whether QIcon::name() exists. It was added in late Qt 4.7 cycle, and is # not present in betas. -- 2.11.0