hasufell 14/10/10 20:18:47
Added: osgearth-2.6-disable-qt5.patch
osgearth-2.6-cmake-options.patch
Log:
version bump
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key BDEED020)
Revision Changes Path
1.1
sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch?rev=1.1&content-type=text/plain
Index: osgearth-2.6-disable-qt5.patch
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,10 +146,6 @@
FIND_PACKAGE(Duktape)
ENDIF (WITH_EXTERNAL_DUKTAPE)
-FIND_PACKAGE(Qt5Core QUIET)
-FIND_PACKAGE(Qt5Widgets QUIET)
-FIND_PACKAGE(Qt5Gui QUIET)
-FIND_PACKAGE(Qt5OpenGL QUIET)
IF ( Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND )
SET(QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS})
ELSE()
1.1
sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch?rev=1.1&content-type=text/plain
Index: osgearth-2.6-cmake-options.patch
===================================================================
commit d92cee4d9870fab08fdfadf9ab0bfb4658a09aa3
Author: hasufell <hasuf...@gentoo.org>
Date: Fri Nov 22 14:06:34 2013 +0100
add cmake options
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34cd375..dbb4cb4 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,8 +129,17 @@
# JavaScript Engines:
SET(V8_DIR "" CACHE PATH "set to base V8 install path")
-FIND_PACKAGE(V8)
-FIND_PACKAGE(JavaScriptCore)
+OPTION(OSGEARTH_USE_V8 "Enable to use V8 JavaScript engine" ON)
+IF(OSGEARTH_USE_V8)
+ FIND_PACKAGE(V8)
+ENDIF(OSGEARTH_USE_V8)
+
+OPTION(OSGEARTH_USE_JAVASCRIPTCORE "Enable use of JavaScriptCore" ON)
+OPTION(OSGEARTH_USE_LIBNOISE "Enable use of LibNoise" ON)
+
+IF (OSGEARTH_USE_JAVASCRIPTCORE)
+ FIND_PACKAGE(JavaScriptCore)
+ENDIF (OSGEARTH_USE_JAVASCRIPTCORE)
SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide
version of Duktape")
IF (WITH_EXTERNAL_DUKTAPE)
