| Previous changeset 14:283b9344e7c4 (2016-07-12) Next changeset 16:cee17b592b17 (2016-07-12) |
|
Commit message:
Uploaded |
|
modified:
tool_dependencies.xml |
| b |
| diff -r 283b9344e7c4 -r 37a6491da3ed tool_dependencies.xml --- a/tool_dependencies.xml Tue Jul 12 09:19:19 2016 -0400 +++ b/tool_dependencies.xml Tue Jul 12 09:36:46 2016 -0400 |
| b |
| @@ -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=`pwd`/../build \ + -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_Group_StandAlone:BOOL=OFF \ -DVTK_Group_Rendering:BOOL=OFF \ @@ -63,18 +63,6 @@ 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> @@ -83,7 +71,7 @@ <action type="change_directory">icqsol</action> <action type="shell_command"> - export PATH=$INSTALL_DIR/bin:$PATH && + export PATH=$INSTALL_DIR/vtk/bin:$PATH && export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 && export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib && $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR @@ -126,7 +114,7 @@ export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH && cmake \ -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/../build \ + -DCMAKE_INSTALL_PREFIX:PATH==$INSTALL_DIR/vtk \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_Group_StandAlone:BOOL=OFF \ -DVTK_Group_Rendering:BOOL=OFF \ @@ -158,18 +146,6 @@ 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> @@ -178,7 +154,7 @@ <action type="change_directory">icqsol</action> <action type="shell_command"> - export PATH=$INSTALL_DIR/bin:$PATH && + export PATH=$INSTALL_DIR/vtk/bin:$PATH && export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 && export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib && $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR && |