| 1 |
--- a/CMakeLists.txt
|
| 2 |
+++ b/CMakeLists.txt
|
| 3 |
@@ -126,6 +126,15 @@ endif(APPLE)
|
| 4 |
################## some compiler settings ################################
|
| 5 |
if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 )
|
| 6 |
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")
|
| 7 |
+ include(CheckCXXCompilerFlag)
|
| 8 |
+ check_cxx_compiler_flag(-fvisibility=hidden __SOPRANO_HAVE_GCC_VISIBILITY)
|
| 9 |
+ check_cxx_compiler_flag(-fvisibility-inlines-hidden __SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
|
| 10 |
+ if(__SOPRANO_HAVE_GCC_VISIBILITY)
|
| 11 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
|
| 12 |
+ endif(__SOPRANO_HAVE_GCC_VISIBILITY)
|
| 13 |
+ if(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
|
| 14 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
|
| 15 |
+ endif(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
|
| 16 |
endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 )
|
| 17 |
if(MSVC)
|
| 18 |
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Zc:wchar_t-)
|
| 19 |
--- a/index/CMakeLists.txt
|
| 20 |
+++ b/index/CMakeLists.txt
|
| 21 |
@@ -27,15 +27,14 @@ configure_file(clucene-config.h.cmake ${
|
| 22 |
# CLucene requires exception support and has no support for visibility=hidden
|
| 23 |
# so we must use the default (i.e. public) value for -fvisibility
|
| 24 |
IF(NOT WIN32)
|
| 25 |
- include(CheckCXXCompilerFlag)
|
| 26 |
- # Only GCC supports these flags
|
| 27 |
IF(CMAKE_COMPILER_IS_GNUCXX)
|
| 28 |
- check_cxx_compiler_flag(-fvisibility=hidden __SOPRANO_HAVE_GCC_VISIBILITY)
|
| 29 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
|
| 30 |
if(__SOPRANO_HAVE_GCC_VISIBILITY)
|
| 31 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fvisibility=default")
|
| 32 |
- else(__SOPRANO_HAVE_GCC_VISIBILITY)
|
| 33 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
|
| 34 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
|
| 35 |
endif(__SOPRANO_HAVE_GCC_VISIBILITY)
|
| 36 |
+ if(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
|
| 37 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-visibility-inlines-hidden")
|
| 38 |
+ endif(__SOPRANO_HAVE_GCC_INLINE_VISIBILITY)
|
| 39 |
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
| 40 |
ENDIF(NOT WIN32)
|
| 41 |
|
Parent Directory
| 
Revision Log