Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (64d1ded0f0fdf48a51a74cb59cde5efa49defb29)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (64d1ded0f0fdf48a51a74cb59cde5efa49defb29)
  • Date: Thu, 25 Sep 2014 21:44:10 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

science-libs/vtk/BUILD | 88
+++++++++--------------------------------------
science-libs/vtk/DEPENDS | 84 +++++++++++++++++++++-----------------------
science-libs/vtk/HISTORY | 2 +
3 files changed, 60 insertions(+), 114 deletions(-)

New commits:
commit 64d1ded0f0fdf48a51a74cb59cde5efa49defb29
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vtk: Add missing dependencies

commit e560cf8a2dfd1cc4a9cd8fc406eec1c21874d6de
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vtk: Replace custom code by cmake_build

diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD
index b02713e..67e73c2 100755
--- a/science-libs/vtk/BUILD
+++ b/science-libs/vtk/BUILD
@@ -1,72 +1,20 @@
-export CFLAGS="${CFLAGS//-ffast-math}" &&
-export VTK_DATA_ROOT=/usr/share/vtk/VTKData &&
-export VTK_INSTALL_PATH=/usr &&
-export CMAKE_INSTALL_PREFIX=/usr &&
+CFLAGS="${CFLAGS//-ffast-math}" &&
+CXXFLAGS="${CXXFLAGS//-ffast-math}" &&

-cmake . &&
-sedit "s/^CMAKE_INSTALL_PREFIX:PATH=.*$/CMAKE_INSTALL_PREFIX:PATH=\/usr/"
CMakeCache.txt &&
-sedit "s/BUILD_SHARED_LIBS\:BOOL=OFF/BUILD_SHARED_LIBS\:BOOL=ON/"
CMakeCache.txt &&
-sedit "s/CMAKE_BUILD_TYPE:STRING=/&Release/" CMakeCache.txt
&&
-# Building examples fails on VTK 6.1.0
-#sedit "s/BUILD_EXAMPLES\:BOOL=OFF/BUILD_EXAMPLES\:BOOL=ON/" CMakeCache.txt
&&
-sedit "s/VTK_USE_HYBRID\:BOOL=OFF/VTK_USE_HYBRID\:BOOL=ON/" CMakeCache.txt
&&
-sedit
"s/CMAKE_CXX_FLAGS_RELEASE\:STRING=-O3/CMAKE_CXX_FLAGS_RELEASE\:STRING=$CFLAGS/"
CMakeCache.txt &&
-
-#Use java.
-if echo $OPTS| grep -q "with-java" ; then
- sedit "s/VTK_USE_SYSTEM_ZLIB\:BOOL=OFF/VTK_USE_SYSTEM_ZLIB\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-if echo $OPTS| grep -q "with-python"; then
- sedit "s/Python language.\" OFF/Python language.\" ON/" CMakeLists.txt
-fi &&
-
-if echo $OPTS| grep -q "with-tcl"; then
- sedit "s/TCL language.\" OFF/TCL language.\" ON/" CMakeLists.txt
-fi &&
-
-if echo $OPTS| grep -q "with-doxygen" ; then
- sedit "s/BUILD_DOCUMENTATION\:BOOL=OFF/BUILD_DOCUMENTATION\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's expat library.
-if echo $OPTS| grep -q "with-expat" ; then
- sedit "s/VTK_USE_SYSTEM_EXPAT\:BOOL=OFF/VTK_USE_SYSTEM_EXPAT\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's jpeg library.
-if echo $OPTS| grep -q "with-jpeg" ; then
- sedit "s/VTK_USE_SYSTEM_JPEG\:BOOL=OFF/VTK_USE_SYSTEM_JPEG\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's png library.
-if echo $OPTS| grep -q "with-libpng" ; then
- sedit "s/VTK_USE_SYSTEM_PNG\:BOOL=OFF/VTK_USE_SYSTEM_PNG\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's tiff library.
-if echo $OPTS| grep -q "with-tiff" ; then
- sedit "s/VTK_USE_SYSTEM_TIFF\:BOOL=OFF/VTK_USE_SYSTEM_TIFF\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-#Use the system's zlib library.
-if echo $OPTS| grep -q "with-zlib" ; then
- sedit "s/VTK_USE_SYSTEM_ZLIB\:BOOL=OFF/VTK_USE_SYSTEM_ZLIB\:BOOL=ON/"
CMakeCache.txt
-fi &&
-
-make
-
-# java is a little broken for now
-# if echo $OPTS| grep -q "with-java" ; then
-# if spell_ok j2sdk ; then export JAVA_HOME=/usr/java/j2sdk;
-# elif spell_ok j2sdk-bin ; then export JAVA_HOME=/usr/lib/j2sdk1.4.1 ;
-# fi &&
-# sedit "s/Java language.\" OFF/Java language.\" ON/" CMakeLists.txt &&
-# stupid thing fails first time on purpose ! so don't use && OK !
-# cmake .
-# sedit
"s:^JAVA_AWT_INCLUDE_PATH\:PATH=.*$:JAVA_AWT_INCLUDE_PATH\:PATH=$JAVA_HOME\/include:"
CMakeCache.txt &&
-# sedit
"s:^JAVA_AWT_LIBRARY\:FILEPATH=.*$:JAVA_AWT_LIBRARY\:FILEPATH=$JAVA_HOME\/jre\/lib\/i386\/libawt.so:"
CMakeCache.txt &&
-# sedit
"s:^JAVA_INCLUDE_PATH\:PATH=.*$:JAVA_INCLUDE_PATH\:PATH=$JAVA_HOME\/include:"
CMakeCache.txt &&
-# sedit
"s:^JAVA_INCLUDE_PATH2\:PATH=.*$:JAVA_INCLUDE_PATH2\:PATH=$JAVA_HOME\/include\/linux:"
CMakeCache.txt
-# fi &&
+OPTS+=" -DBUILD_SHARED_LIBS=ON -DWTK_USE_HYBRID=ON" &&

+# Building examples fails on VTK 6.1.0
+#OPTS+=' -DBUILD_EXAMPLES=ON'
+
+# Java is a little broken for now
+# if echo $OPTS | grep -q VTK_WRAP_JAVA=ON; then
+# if [ -z "$JAVA_HOME" -a -f /etc/profile.d/java.sh ]; then
+# . /etc/profile.d/java.sh
+# fi &&
+# OPTS+=" -DJAVA_INCLUDE_PATH=$JAVA_HOME/include"
+# OPTS+=" -DJAVA_INCLUDE_PATH2=$JAVA_HOME/include/linux"
+# OPTS+=" -DJAVA_AWT_INCLUDE_PATH=$JAVA_HOME/include"
+# OPTS+=" -DJAVA_AWT_LIBRARY=$JAVA_HOME/jre/lib/i386/libawt.so"
+# fi
+
+cmake_build
diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS
index 53c4c3b..b2e086a 100755
--- a/science-libs/vtk/DEPENDS
+++ b/science-libs/vtk/DEPENDS
@@ -1,45 +1,41 @@
-depends cmake &&
-depends xorg-libs &&
-depends tk &&
-
-#optional_depends 'JAVA' 'with-java' 'Wrap VTK classes into the JAVA
language' 'z-rejected' &&
-
-optional_depends python \
- "with-python" \
- "" \
- "Wrap VTK classes into the Python language" &&
-
-optional_depends tcl \
- "with-tcl" \
- "" \
- "Wrap VTK classes into the tcl language" &&
-
-optional_depends zlib \
- "with-zlib" \
- "" \
- "Use the system's zlib library" &&
-
-optional_depends tiff \
- "with-tiff" \
- "" \
- "Use the system's tiff library" &&
-
-optional_depends JPEG \
- "with-jpeg" \
- "" \
- "Use the system's jpeg library" &&
-
-optional_depends libpng \
- "with-libpng" \
- "" \
- "Use the system's libpng library" &&
-
-optional_depends expat \
- "with-expat" \
- "" \
- "Use the system's expat library" &&
-
-optional_depends doxygen \
- "with-doxygen" \
- "" \
+optdep() {
+ local o="$3"
+ [ "$o" ] || o=$(tr a-z A-Z <<< "$1")
+ optional_depends "$1" -D"$2"_"$o"=O{N,FF} "$4"
+}
+
+optsyslib() {
+ optdep "$1" WITH_SYSTEM "$2" "Use system's $1 library"
+}
+
+optwrap() {
+ optdep "$1" VTK_WRAP "$2" "Wrap VTK classes into the $1 language"
+}
+
+depends cmake &&
+depends xorg-libs &&
+depends tk &&
+
+#optwrap JAVA &&
+optwrap python &&
+optwrap tcl &&
+
+optsyslib zlib &&
+optsyslib tiff &&
+optsyslib JPEG &&
+optsyslib libpng PNG &&
+optsyslib expat &&
+optsyslib libxml2 &&
+optsyslib freetype2 FREETYPE &&
+optsyslib gl2ps &&
+optsyslib hdf5 &&
+optsyslib netcdf &&
+optsyslib libtheora OGGTHEORA &&
+
+#optsyslib jsoncpp &&
+#optsyslib libproj4 &&
+#optsyslib xdmf2 &&
+
+optional_depends doxygen \
+ -DBUILD_DOCUMENTATION=O{N,FF} \
"build documentation"
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index 0df6072..9b0a867 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -3,6 +3,8 @@
Disabled building examples
Remove -ffast-math CFLAG (makes internal sqlite build fail)
updated spell to 6.1.0
+ * BUILD, DEPENDS: Replace custom code by cmake_build
+ * DEPENDS: Added missing dependencies

2012-10-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.10.0



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (64d1ded0f0fdf48a51a74cb59cde5efa49defb29), Ismael Luceno, 09/25/2014

Archive powered by MHonArc 2.6.24.

Top of Page