Mercurial > repos > bgruening > package_rdkit_2012_12

changeset 5:11cf08dfb0e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bgruening
date Sat, 11 May 2013 16:07:46 -0400
parents 0adc830e7d71
children 158956be0623
files tool_dependencies.xml
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Apr 26 07:14:22 2013 -0400
+++ b/tool_dependencies.xml	Sat May 11 16:07:46 2013 -0400
@@ -24,17 +24,20 @@
                     </repository>
                 </action>
 
+                <!-- PYTHONPATH_NUMPY is set in the numpy package -->
                 <action type="shell_command">export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib/ &amp;&amp;
                     export PYTHONPATH=$PYTHONPATH:`pwd`/ &amp;&amp;
                     mkdir build &amp;&amp;
                     cd build &amp;&amp;
-                    cmake .. -DBOOST_ROOT=$BOOST_ROOT_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR/rdkit/ -DRDK_INSTALL_INTREE=OFF</action>
+                    cmake .. -DBOOST_ROOT=$BOOST_ROOT_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR/rdkit/ -DRDK_INSTALL_INTREE=OFF -DPYTHON_NUMPY_INCLUDE_PATH=$PYTHONPATH_NUMPY/numpy/core/include/</action>
                 <action type="shell_command">cd ./build &amp;&amp; make </action>
                 <action type="shell_command">cd ./build &amp;&amp; make install</action>
 
                 <action type="set_environment">
+                    <environment_variable name="RDBASE" action="set_to">$INSTALL_DIR/rdkit</environment_variable>
+                    <environment_variable name="LD_LIBRARY_PATH" action="append_to">$INSTALL_DIR/rdkit</environment_variable>
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/rdkit/bin</environment_variable>
-                    <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/rdkit/lib/</environment_variable>
+                    <environment_variable name="PYTHONPATH" action="prepend_to">$INSTALL_DIR/rdkit/lib</environment_variable>
                 </action>
             </actions>
         </install>