Skip to content
Permalink
Browse files

disable symbol visiblity flags for globe plugin on release builds on …

…trusty
  • Loading branch information
jef-n committed Mar 26, 2016
1 parent ea85bef commit 1bb98d6db932b0d1d7db0d34eb06fae144c523cf
Showing with 8 additions and 0 deletions.
  1. +4 −0 debian/rules
  2. +1 −0 src/plugins/CMakeLists.txt
  3. +3 −0 src/plugins/globe/CMakeLists.txt
@@ -135,6 +135,10 @@ endif

ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CMAKE_OPTS += -DCMAKE_BUILD_TYPE=Debug
else
ifneq (,$(findstring $(DISTRIBUTION),"trusty"))
CMAKE_OPTS += -DKEEP_GLOBE_CXX_FLAGS=TRUE
endif
endif

ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -1,4 +1,5 @@
IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(CMAKE_CXX_FLAGS_OLD "${CMAKE_CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
ENDIF()
# override default path where built files are put to allow running qgis without installing
@@ -1,5 +1,8 @@
# set path to additional CMake modules
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
IF (KEEP_GLOBE_CXX_FLAGS)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_OLD}")
ENDIF()

FIND_PACKAGE(OSG REQUIRED)
FIND_PACKAGE(OSGEARTH REQUIRED)

0 comments on commit 1bb98d6

Please sign in to comment.
You can’t perform that action at this time.