osgearth: simplify patch + update configuration options

This makes https://github.com/gwaldron/osgearth/pull/1077 unnecessary
This commit is contained in:
Boris Pek 2018-03-23 06:06:04 +03:00 committed by Tony Theodore
parent 5132a84669
commit a118ee0271
2 changed files with 2 additions and 20 deletions

View File

@ -42,22 +42,3 @@ index 1111111..2222222 100644
ADD_SUBDIRECTORY( tests )
ENDIF()
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Thu, 22 Mar 2018 22:53:10 +0300
Subject: [PATCH 2/2] Fixed linking of osgEarthSymbology with geos when build
as shared library
diff --git a/src/osgEarthSymbology/CMakeLists.txt b/src/osgEarthSymbology/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/osgEarthSymbology/CMakeLists.txt
+++ b/src/osgEarthSymbology/CMakeLists.txt
@@ -1,5 +1,6 @@
IF (DYNAMIC_OSGEARTH)
ADD_DEFINITIONS(-DOSGEARTHSYMBOLOGY_LIBRARY)
+ ADD_DEFINITIONS(-DGEOS_INLINE)
ELSE (DYNAMIC_OSGEARTH)
ADD_DEFINITIONS(-DOSGEARTHSYMBOLOGY_LIBRARY_STATIC)
ENDIF(DYNAMIC_OSGEARTH)

View File

@ -15,7 +15,8 @@ define $(PKG)_BUILD
-DWITH_EXTERNAL_TINYXML=OFF \
-DBUILD_OSGEARTH_EXAMPLES=OFF \
-DBUILD_APPLICATIONS=OFF \
-DBUILD_TESTS=OFF
-DBUILD_TESTS=OFF \
-DCMAKE_CXX_FLAGS='-DGEOS_INLINE=1'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
$(MAKE) -C '$(BUILD_DIR)' -j 1 install