From f349bc9be21b6db0c0416ec9828ac0e23ea83323 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sat, 16 Feb 2019 13:19:07 +0100 Subject: fix issue #2, add WITH_ALL_OPTIONS, clean up CMakeLists.txt from libvisual and write config.h.cmake up Signed-off-by: gregory guy (cherry picked from commit 7c4e6cb6819590d33f6ae66cc92bbf83d2601684) --- CMakeLists.txt | 10 +++++----- config.h.cmake | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b2bf44..cdb1c0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ cmake_minimum_required( VERSION 2.8 ) ##### general package setup ##################### project( dolphin ) +set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -40,9 +41,10 @@ include( TDESetupPaths ) tde_setup_paths( ) -##### optional stuff ############################ +##### optional stuff -# option( WITH_LIBVISUAL "Enable libvisual support" OFF ) +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) ##### user requested modules @@ -59,9 +61,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings ################# -add_definitions( - -DHAVE_CONFIG_H -) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/config.h.cmake b/config.h.cmake index e69de29..61ede3a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -0,0 +1,8 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ -- cgit v1.2.1