# HG changeset patch
# User greg
# Date 1447538590 18000
# Node ID ee534b2a2094bee0f93aa9e30cf877b3078638e4
# Parent  a357536fb3639a1dca7a0a3e575d9f5f654859d1
Uploaded

diff -r a357536fb363 -r ee534b2a2094 tool_dependencies.xml
--- a/tool_dependencies.xml	Sat Nov 14 13:47:18 2015 -0500
+++ b/tool_dependencies.xml	Sat Nov 14 17:03:10 2015 -0500
@@ -1,23 +1,32 @@
 <?xml version="1.0"?>
 <tool_dependency>
-
+    <package name="cmake" version="3.2.3">
+        <repository changeset_revision="e932c7599efd" name="package_cmake_3_2_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
     <package name="icqsol" version="1.0">
         <install version="1.0">
             <actions_group>
-                <actions os="linux" architecture="x86_64">
+                <actions architecture="x86_64" os="linux">
                     <!-- Install and compile Anaconda 2.3.0 which provides Python 2.7.10 -->
-                    <action type="download_file" target_filename="Anaconda-2.3.0-Linux-x86_64.sh">https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-Linux-x86_64.sh</action>
+                    <action target_filename="Anaconda-2.3.0-Linux-x86_64.sh" type="download_file">https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-Linux-x86_64.sh</action>
+                    
+                    <action type="set_environment_for_install">
+                        <repository changeset_revision="e932c7599efd" name="package_cmake_3_2_3" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                            <package name="cmake" version="3.2.3" />
+                        </repository>
+                    </action>
+
                     <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR</action>
 
                     <!-- Install VTK 6.3.0 into the above Python -->
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &&
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &&
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &amp;&amp;
+                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             conda install -c https://conda.anaconda.org/anaconda vtk --yes
-                        ]]>
+                        
                     </action>
 
                     <!-- Install and compile pycsg version 0.3.0 as a package in the above Python -->
@@ -26,13 +35,13 @@
                     <action type="shell_command">git clone https://github.com/pletzer/pycsg.git</action>
                     <action type="change_directory">pycsg</action>
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &&
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &&
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &amp;&amp;
+                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
-                        ]]>
+                        
                     </action>
 
                     <!-- Install and compile pytriangle version 1.0 as a package in the above Python -->
@@ -41,13 +50,13 @@
                     <action type="shell_command">git clone https://github.com/pletzer/pytriangle.git</action>
                     <action type="change_directory">pytriangle</action>
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &&
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &&
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &amp;&amp;
+                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
-                        ]]>
+                        
                     </action>
     
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
@@ -56,12 +65,12 @@
                     <action type="shell_command">git clone https://github.com/pletzer/icqsol.git</action>
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &&
-                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &amp;&amp;
+                            export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH &amp;&amp;
                             cmake -DINSTALL_USER=OFF -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
-                        ]]>
+                        
                     </action>
 
                     <action type="set_environment">
@@ -75,20 +84,20 @@
                     </action>
                 </actions>
 
-                <actions os="darwin" architecture="x86_64">
+                <actions architecture="x86_64" os="darwin">
                     <!-- Install and compile Anaconda 2.3.0 which provides Python 2.7.10 -->
-                    <action type="download_file" target_filename="Anaconda-2.3.0-MacOSX-x86_64.sh">https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-MacOSX-x86_64.sh</action>
+                    <action target_filename="Anaconda-2.3.0-MacOSX-x86_64.sh" type="download_file">https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-MacOSX-x86_64.sh</action>
                     <action type="shell_command">bash Anaconda-2.3.0-MacOSX-x86_64.sh -b -f -p $INSTALL_DIR</action>
 
                     <!-- Install VTK 6.3.0 into the above Python -->
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &&
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib:$DYLD_LIBRARY_PATH &&
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH &amp;&amp;
+                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib:$DYLD_LIBRARY_PATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             conda install -c https://conda.anaconda.org/anaconda vtk --yes
-                        ]]>
+                        
                     </action>
                     <action type="shell_command">
                         ln -s $INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin/vtkpython $INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin/python
@@ -100,13 +109,13 @@
                     <action type="shell_command">git clone https://github.com/pletzer/pycsg.git</action>
                     <action type="change_directory">pycsg</action>
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &&
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &&
-                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &amp;&amp;
+                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &amp;&amp;
+                            export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
-                        ]]>
+                        
                     </action>
 
                     <!-- Install and compile pytriangle version 1.0 as a package in the above Python -->
@@ -115,13 +124,13 @@
                     <action type="shell_command">git clone https://github.com/pletzer/pytriangle.git</action>
                     <action type="change_directory">pytriangle</action>
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &&
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &amp;&amp;
+                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &amp;&amp;
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
                             $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR
-                        ]]>
+                        
                     </action>
     
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
@@ -130,12 +139,12 @@
                     <action type="shell_command">git clone https://github.com/pletzer/icqsol.git</action>
                     <action type="change_directory">icqsol</action>
                     <action type="shell_command">
-                        <![CDATA[
-                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &&
-                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &&
-                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &&
+                        
+                            export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH &amp;&amp;
+                            export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin &amp;&amp;
+                            export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH &amp;&amp;
                             cmake -DINSTALL_USER=OFF -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
-                        ]]>
+                        
                     </action>
 
                     <action type="set_environment">
@@ -156,7 +165,7 @@
             </actions_group>
         </install>
         <readme>
-<![CDATA[
+
 This installation recipe installs the Anaconda version 2.3.0 of the Python programming language
 version 2.7.10.  Anaconda is a completely free Python distribution (including for commercial use
 and redistribution). It includes more than 300 of the most popular Python packages for science,
@@ -194,7 +203,7 @@
 5) Icqsol version 1.0
 
 Icqsol is a collection of tools for constructing and solving partial differential equations.
-            ]]>
+            
 
         </readme>
     </package>