[arch-commits] Commit in vtk/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Friday, February 12, 2016 @ 19:19:07
  Author: anatolik
Revision: 161434

Put tcl files into searchable path (per $auto_path variable)

Modified:
  vtk/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-12 17:09:32 UTC (rev 161433)
+++ PKGBUILD	2016-02-12 18:19:07 UTC (rev 161434)
@@ -74,6 +74,8 @@
   # flags to use python2 instead of python which is 3.x.x on archlinux
   local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
 
+  local _tkver=$(echo 'puts $tcl_version' | tclsh)
+
   cmake \
     -Wno-dev \
     -DCMAKE_SKIP_RPATH=ON \
@@ -93,6 +95,7 @@
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     -DVTK_CUSTOM_LIBRARY_SUFFIX="" \
     -DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \
+    -DVTK_INSTALL_TCL_DIR=/usr/lib/tcl${_tkver}/vtk/ \
     ${cmake_system_flags} \
     ${cmake_system_python_flags} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -105,7 +108,7 @@
 package() {
   cd "${srcdir}/build"
 
-  ninja DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 
   # Move the vtk.jar to the arch-specific location
   install -dv "${pkgdir}/usr/share/java/vtk"