Mercurial > repos > bgruening > package_openms_latest

changeset 7:a98539411cd6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author iuc
date Tue, 27 Jan 2015 11:31:58 -0500
parents 1d7e52789960
children c73581afb550
files tool_dependencies.xml
diffstat 1 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Nov 12 10:50:52 2014 -0500
+++ b/tool_dependencies.xml	Tue Jan 27 11:31:58 2015 -0500
@@ -10,7 +10,10 @@
         <repository changeset_revision="03abe628fbe8" name="package_zlib_1_2_8" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="bzlib" version="1.0.6">
-        <repository changeset_revision="2dec91192fc7" name="package_bzlib_1_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="d971aef661a7" name="package_bzlib_1_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="boost" version="1.55.0">
+        <repository changeset_revision="9fbaadc2f81a" name="package_boost_1_55" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="openms" version="1.12">
         <install version="1.0">
@@ -27,9 +30,12 @@
                     <repository changeset_revision="03abe628fbe8" name="package_zlib_1_2_8" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="zlib" version="1.2.8" />
                     </repository>
-                    <repository changeset_revision="2dec91192fc7" name="package_bzlib_1_0" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="d971aef661a7" name="package_bzlib_1_0" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="bzlib" version="1.0.6" />
                     </repository>
+                    <repository changeset_revision="9fbaadc2f81a" name="package_boost_1_55" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                        <package name="boost" version="1.55.0" />
+                    </repository>
                 </action>
 
                 <action type="change_directory">contrib</action>
@@ -37,7 +43,7 @@
                 <action type="shell_command">cmake . -DBUILD_TYPE=LIBSVM</action>
                 <action type="shell_command">cmake . -DBUILD_TYPE=XERCESC</action>
                 <action type="shell_command">cmake . -DBUILD_TYPE=GSL</action>
-                <action type="shell_command">cmake . -DBUILD_TYPE=BOOST -DNUMBER_OF_JOBS=4</action>
+                <!--action type="shell_command">cmake . -DBUILD_TYPE=BOOST -DNUMBER_OF_JOBS=4</action-->
                 <action type="shell_command">cmake . -DBUILD_TYPE=COINOR</action>
                 <action type="shell_command">cmake . -DBUILD_TYPE=BZIP2</action>
                 <action type="shell_command">cmake . -DBUILD_TYPE=GLPK</action>
@@ -45,7 +51,7 @@
                 <action type="shell_command">cmake . -DBUILD_TYPE=WILDMAGIC</action>
 
                 <action type="change_directory">..</action>
-                <action type="shell_command">cmake . -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DHAS_XSERVER=OFF -DENABLE_TUTORIALS=OFF -DENABLE_STYLE_TESTING=OFF -DENABLE_UNITYBUILD=OFF -DWITH_GUI=OFF</action>
+                <action type="shell_command">cmake . -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DHAS_XSERVER=OFF -DENABLE_TUTORIALS=OFF -DENABLE_STYLE_TESTING=OFF -DENABLE_UNITYBUILD=OFF -DWITH_GUI=OFF -DBoost_INCLUDE_DIR=$BOOST_ROOT_DIR/include/</action>
                 <action type="shell_command">make OpenMS TOPP UTILS</action>
                 <action type="shell_command">make install</action>
                 <!-- ToDo can we get it easily without svn? Is this included in the final tarball? -->
@@ -54,6 +60,8 @@
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>
                     <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$ENV[QT_ROOT_DIR]/lib/</environment_variable>
+                    <environment_variable action="set_to" name="OPENMS_ROOT_PATH">$INSTALL_DIR</environment_variable>
+                    <environment_variable action="set_to" name="OPENMS_DATA_PATH">$INSTALL_DIR/share/OpenMS/</environment_variable>
                 </action>
             </actions>
         </install>