[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/soprano
From:       Jonathan Riddell <jr () jriddell ! org>
Date:       2010-02-19 11:20:08
Message-ID: 1266578408.356130.12073.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1092652 by jriddell:

Allow to Build soprano with -fvisibility=hidden -fvisibility-inlines-hidden, patch by \
Modestas Vainius of Debian

 M  +9 -0      CMakeLists.txt  
 M  +5 -6      index/CMakeLists.txt  


--- trunk/kdesupport/soprano/CMakeLists.txt #1092651:1092652
@@ -146,6 +146,15 @@
 ##################  some compiler settings ################################
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 )
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi \
-Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security \
-fno-check-new -fno-common") +    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag(-fvisibility=hidden __SOPRANO_HAVE_GCC_VISIBILITY)
+    check_cxx_compiler_flag(-fvisibility-inlines-hidden \
__SOPRANO_HAVE_GCC_INLINE_VISIBILITY) +    if(__SOPRANO_HAVE_GCC_VISIBILITY)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+    endif(__SOPRANO_HAVE_GCC_VISIBILITY)
+    if(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+    endif(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
 endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 )
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
                -Zc:wchar_t-)
--- trunk/kdesupport/soprano/index/CMakeLists.txt #1092651:1092652
@@ -27,15 +27,14 @@
 # CLucene requires exception support and has no support for visibility=hidden
 # so we must use the default (i.e. public) value for -fvisibility
 IF(NOT WIN32)
-    include(CheckCXXCompilerFlag)
-    # Only GCC supports these flags
     IF(CMAKE_COMPILER_IS_GNUCXX)
-        check_cxx_compiler_flag(-fvisibility=hidden __SOPRANO_HAVE_GCC_VISIBILITY)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
         if(__SOPRANO_HAVE_GCC_VISIBILITY)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions \
                -fvisibility=default")
-        else(__SOPRANO_HAVE_GCC_VISIBILITY)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
         endif(__SOPRANO_HAVE_GCC_VISIBILITY)
+        if(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-visibility-inlines-hidden")
+        endif(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
     ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(NOT WIN32)
 


[prev in list] [next in list] [prev in thread] [next in thread]