summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorFlorian Franzmann2019-10-05 16:49:16 +0200
committerFlorian Franzmann2019-10-05 18:29:11 +0200
commit694549bcedc4520e39e864a854692726537e07cf (patch)
tree24312554d3b508a110864ed25c388d83d2e93e06 /libs
parentc75d725d19aafed29d39b056d0afbc4e4f0bb55e (diff)
libs/openscenegraph: use CMAKE_*
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/openscenegraph/BUILD2
-rwxr-xr-xlibs/openscenegraph/CONFIGURE1
-rwxr-xr-xlibs/openscenegraph/DEPENDS2
-rwxr-xr-xlibs/openscenegraph/DETAILS1
-rw-r--r--libs/openscenegraph/HISTORY3
-rwxr-xr-xlibs/openscenegraph/INSTALL3
6 files changed, 8 insertions, 4 deletions
diff --git a/libs/openscenegraph/BUILD b/libs/openscenegraph/BUILD
index 2966661ab1..20ed4b9ee7 100755
--- a/libs/openscenegraph/BUILD
+++ b/libs/openscenegraph/BUILD
@@ -1,2 +1,2 @@
OPTS+="-DFREETYPE_INCLUDE_DIR_freetype2=/usr/include/freetype2 -DFREETYPE_INCLUDE_DIR_ft2build=/usr/include/freetype2" &&
-cmake_build
+default_build
diff --git a/libs/openscenegraph/CONFIGURE b/libs/openscenegraph/CONFIGURE
new file mode 100755
index 0000000000..b2f02c3032
--- /dev/null
+++ b/libs/openscenegraph/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 5b3d216ffb..91768fc9d9 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
depends freetype2 &&
depends GIFLIB &&
depends gdal &&
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index b2b6210174..cfccc3f210 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=openscenegraph
VERSION=3.6.4
SOURCE=OpenSceneGraph-$VERSION.tar.gz
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 7dde682324..73ed80df87 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL: use CMAKE_*
+
2019-07-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 3.6.4
diff --git a/libs/openscenegraph/INSTALL b/libs/openscenegraph/INSTALL
index 122885c86b..7316569414 100755
--- a/libs/openscenegraph/INSTALL
+++ b/libs/openscenegraph/INSTALL
@@ -1,2 +1 @@
-make INST_LOCATION=${INSTALL_ROOT}/usr \
- INST_EXAMPLES=${INSTALL_ROOT}/usr/bin install
+INST_LOCATION=${INSTALL_ROOT}/usr INST_EXAMPLES=${INSTALL_ROOT}/usr/bin cmake_install