Packages.py: Minor tweaks on packages to install

zmoratto · May 30, 2014 · 080ae79 · 080ae79
1 parent 14ac5eb
commit 080ae79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/BinaryBuilder.py b/BinaryBuilder.py
@@ -743,7 +743,7 @@ class Apps:
                 tif_mosaic wv_correct lronacjitreg'
     install_pkgs = \
                  'boost openscenegraph flapack arbitrary_qt curl    \
-                 suitesparse amd colamd cholmod flann spice qwt gsl \
+                 suitesparse amd colamd cholmod glog ceres flann spice qwt gsl \
                  geos xercesc protobuf z ilmbase openexr jpeg  \
                  laszip liblas geoid isis superlu geotiff gdal yaml libnabo \
                  eigen libpointmatcher proj4'

diff --git a/Packages.py b/Packages.py
@@ -815,10 +815,12 @@ def configure(self):
 
     @stage
     def install(self):
-        d = P.join(self.env['INSTALL_DIR'],'include')
+        inc = P.join(self.env['INSTALL_DIR'],'include')
+        lib = P.join(self.env['INSTALL_DIR'],'lib')
         self.helper('make','install',
-                    'INSTALL_LIB='+P.join(self.env['INSTALL_DIR'],'lib'),
-                    'INSTALL_INCLUDE='+d)
+                    'INSTALL_INCLUDE=' + inc,
+                    'INSTALL_LIB=' + lib
+                    )
 
 class osg3(CMakePackage):
     src = 'http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.0.zip'
@@ -910,6 +912,7 @@ def configure(self):
             '-DBoost_INCLUDE_DIR=' + P.join(self.env['INSTALL_DIR'],'include','boost-'+boost.version),
             '-DBoost_LIBRARY_DIRS=' + P.join(self.env['INSTALL_DIR'],'lib'),
             '-DCMAKE_VERBOSE_MAKEFILE=ON', '-DSHARED_LIBS=ON', '-DMINIGLOG=OFF',
+            '-DSUITESPARSE=ON', '-DLAPACK=ON',
             '-DLIB_SUFFIX=', '-DBUILD_EXAMPLES=OFF', '-DBUILD_SHARED_LIBS=ON', '-DBUILD_TESTING=OFF'
             ])