[Lunar-commits] <moonbase> OpenSceneGraph: Adjusting the BUILD and DEPENDS.
Dennis `stumbles` Veatch
stumbles at lunar-linux.org
Sat Nov 6 11:40:36 CET 2010
commit a019e92c88e1f38421e734d5ae1651b32bd888a3
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date: Sat Nov 6 06:40:36 2010 -0400
OpenSceneGraph: Adjusting the BUILD and DEPENDS.
It looks for xulrunner*.pc files when the xulrunner module installs those
as mozilla-*.pc files. So sediting the cmake find file accordingly.
Adding a couple of optional_depends.
---
graphics/OpenSceneGraph/BUILD | 9 +++++++++
graphics/OpenSceneGraph/DEPENDS | 4 ++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/graphics/OpenSceneGraph/BUILD b/graphics/OpenSceneGraph/BUILD
index 1a3373d..de1e18e 100644
--- a/graphics/OpenSceneGraph/BUILD
+++ b/graphics/OpenSceneGraph/BUILD
@@ -2,12 +2,21 @@
OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
+ if in_depends $MODULE xulrunner ; then
+ sedit "s:xulrunner-js:mozilla-js:g" CMakeModules/FindXUL.cmake &&
+ sedit "s:xulrunner-nspr:mozilla-nspr:g" CMakeModules/FindXUL.cmake &&
+ sedit "s:xulrunner-nss:mozilla-nss:g" CMakeModules/FindXUL.cmake &&
+ export XUL_INCLUDE_DIR=/usr/include/xulrunner-$(installed_version xulrunner) &&
+ export XUL_LIBRARIES=/usr/lib/xulrunner-$(installed_version xulrunner)
+ fi &&
+
mkdir $OOTB_DIR &&
cd $OOTB_DIR &&
# A q&d fix to get this to compile with ffmpeg-0.6. Revisit on the next OSG bump.
CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" &&
+
cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX \
-DCMAKE_BUILD_TYPE=RELEASE \
$OPTS &&
diff --git a/graphics/OpenSceneGraph/DEPENDS b/graphics/OpenSceneGraph/DEPENDS
index e3315eb..638ed99 100644
--- a/graphics/OpenSceneGraph/DEPENDS
+++ b/graphics/OpenSceneGraph/DEPENDS
@@ -4,3 +4,7 @@ depends libungif
depends curl
depends pth
depends %XINELIB
+
+
+optional_depends xulrunner "" "" "for xulrunner support"
+optional_depends gtkglext "" "" "for gtkglext support"
More information about the Lunar-commits
mailing list