From b8e1998ecd034e8bf2b028ede186d6a32d7758f9 Mon Sep 17 00:00:00 2001
From: Rafal Krypa <r.krypa@samsung.com>
Date: Wed, 3 Sep 2014 14:03:02 +0200
Subject: [PATCH] build: drop D_GNU_SOURCE flag, refactor symbol visibility
 setting

Cynara code doesn't use GNU specific features. There is no need to define
_GNU_SOURCE.
Also set -fvisibility=hidden by default for all targets and change it only
where needed (for building common library).

Change-Id: Ie8f46522866b4f475c09b4e6e57f824defed0e5c
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
---
 CMakeLists.txt                   | 3 +++
 src/admin/CMakeLists.txt         | 1 -
 src/client-common/CMakeLists.txt | 3 ++-
 src/client/CMakeLists.txt        | 1 -
 src/common/CMakeLists.txt        | 3 ++-
 src/service/CMakeLists.txt       | 5 -----
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4da838..98ae1ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,9 @@ ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
 ADD_DEFINITIONS("-Wall")                        # Generate all warnings
 ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
 
+# Don't export symbols by default
+ADD_DEFINITIONS("-fvisibility=hidden")
+
 STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}")
 ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
 
diff --git a/src/admin/CMakeLists.txt b/src/admin/CMakeLists.txt
index e435d29..cc3d7ac 100644
--- a/src/admin/CMakeLists.txt
+++ b/src/admin/CMakeLists.txt
@@ -36,7 +36,6 @@ ADD_LIBRARY(${TARGET_LIB_CYNARA_ADMIN} SHARED ${LIB_CYNARA_ADMIN_SOURCES})
 SET_TARGET_PROPERTIES(
     ${TARGET_LIB_CYNARA_ADMIN}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden"
         SOVERSION ${LIB_CYNARA_ADMIN_VERSION_MAJOR}
         VERSION ${LIB_CYNARA_ADMIN_VERSION}
     )
diff --git a/src/client-common/CMakeLists.txt b/src/client-common/CMakeLists.txt
index fdc41c6..dd05c79 100644
--- a/src/client-common/CMakeLists.txt
+++ b/src/client-common/CMakeLists.txt
@@ -30,12 +30,13 @@ SET(LIB_CYNARA_COMMON_SOURCES
     ${LIB_CYNARA_COMMON_PATH}/cache/CapacityCache.cpp
     )
 
+ADD_DEFINITIONS("-fvisibility=default")
+
 ADD_LIBRARY(${TARGET_LIB_CYNARA_COMMON} SHARED ${LIB_CYNARA_COMMON_SOURCES})
 
 SET_TARGET_PROPERTIES(
     ${TARGET_LIB_CYNARA_COMMON}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE"
         SOVERSION ${LIB_CYNARA_CLIENT_COMMON_VERSION_MAJOR}
         VERSION ${LIB_CYNARA_CLIENT_COMMON_VERSION}
     )
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 09a023e..d364e2d 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -38,7 +38,6 @@ ADD_LIBRARY(${TARGET_LIB_CYNARA} SHARED ${LIB_CYNARA_SOURCES})
 SET_TARGET_PROPERTIES(
     ${TARGET_LIB_CYNARA}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden"
         SOVERSION ${LIB_CYNARA_VERSION_MAJOR}
         VERSION ${LIB_CYNARA_VERSION}
     )
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3113784..f489b44 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -53,12 +53,13 @@ SET(COMMON_SOURCES ${COMMON_SOURCES}
     )
 ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
+ADD_DEFINITIONS("-fvisibility=default")
+
 ADD_LIBRARY(${TARGET_CYNARA_COMMON} SHARED ${COMMON_SOURCES})
 
 SET_TARGET_PROPERTIES(
     ${TARGET_CYNARA_COMMON}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=default"
         SOVERSION ${CYNARA_COMMON_VERSION_MAJOR}
         VERSION ${CYNARA_COMMON_VERSION}
     )
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 9f11ab8..47482eb 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -31,11 +31,6 @@ SET(CYNARA_SOURCES
     ${CYNARA_SERVICE_PATH}/storage/StorageSerializer.cpp
     )
 
-SET_SOURCE_FILES_PROPERTIES(
-    ${CYNARA_SOURCES}
-    PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
-
 INCLUDE_DIRECTORIES(
     ${CYNARA_SERVICE_PATH}
     )
-- 
2.7.4