Mercurial > repos > greg > package_icqsol_1_0

changeset 8:c53330c0566c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Fri, 08 Jul 2016 15:00:11 -0400
parents 94ea1b21697c
children fcc0218a7ad2
files tool_dependencies.xml
diffstat 1 files changed, 27 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Jul 08 14:28:38 2016 -0400
+++ b/tool_dependencies.xml	Fri Jul 08 15:00:11 2016 -0400
@@ -31,7 +31,7 @@
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
-                            -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \
+                            -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \
                             -DVTK_WRAP_PYTHON:BOOL=ON \
                             -DVTK_Group_StandAlone:BOOL=OFF \
                             -DVTK_Group_Rendering:BOOL=OFF \
@@ -63,6 +63,18 @@
                             make install
                         
                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/bin</source_directory>
+                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/include</source_directory>
+                         <destination_directory>$INSTALL_DIR/include</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/lib</source_directory>
+                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
+                     </action>
 
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>
@@ -146,6 +158,18 @@
                             make install
                         
                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/bin</source_directory>
+                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/include</source_directory>
+                         <destination_directory>$INSTALL_DIR/include</destination_directory>
+                     </action>
+                     <action type="move_directory_files">
+                         <source_directory>../build/lib</source_directory>
+                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
+                     </action>
 
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>
@@ -155,6 +179,8 @@
                     <action type="shell_command">
                         
                             export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &amp;&amp;
+                            export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR