zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1180 from davydden/pkg/oce_update_and_fix

Browse Source 
oce: add 0.17.2; fix running tests
This commit is contained in:
Todd Gamblin 2016-07-06 14:27:05 -07:00 committed by GitHub
commit c6e89d9283
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
var/spack/repos/builtin/packages/oce/package.py
View File

@ -23,20 +23,22 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import platform, sys import platform
class Oce(Package): class Oce(Package):
""" """Open CASCADE Community Edition:
Open CASCADE Community Edition: patches/improvements/experiments contributed by users over the official
patches/improvements/experiments contributed by users over the official Open CASCADE library. Open CASCADE library.
""" """
homepage = "https://github.com/tpaviot/oce" homepage = "https://github.com/tpaviot/oce"
url = "https://github.com/tpaviot/oce/archive/OCE-0.17.tar.gz" url = "https://github.com/tpaviot/oce/archive/OCE-0.17.tar.gz"
version('0.17.2', 'bf2226be4cd192606af677cf178088e5')
version('0.17.1', '36c67b87093c675698b483454258af91') version('0.17.1', '36c67b87093c675698b483454258af91')
version('0.17' , 'f1a89395c4b0d199bea3db62b85f818d') version('0.17', 'f1a89395c4b0d199bea3db62b85f818d')
version('0.16.1', '4d591b240c9293e879f50d86a0cb2bb3') version('0.16.1', '4d591b240c9293e879f50d86a0cb2bb3')
version('0.16' , '7a4b4df5a104d75a537e25e7dd387eca') version('0.16', '7a4b4df5a104d75a537e25e7dd387eca')
variant('tbb', default=True, description='Build with Intel Threading Building Blocks') variant('tbb', default=True, description='Build with Intel Threading Building Blocks')
@ -49,8 +51,7 @@ class Oce(Package):
# http://tracker.dev.opencascade.org/view.php?id=26042 # http://tracker.dev.opencascade.org/view.php?id=26042
# https://github.com/tpaviot/oce/issues/605 # https://github.com/tpaviot/oce/issues/605
# https://github.com/tpaviot/oce/commit/61cb965b9ffeca419005bc15e635e67589c421dd.patch # https://github.com/tpaviot/oce/commit/61cb965b9ffeca419005bc15e635e67589c421dd.patch
patch('null.patch',when='@0.16:0.17.1') patch('null.patch', when='@0.16:0.17.1')
def install(self, spec, prefix): def install(self, spec, prefix):
options = [] options = []
@ -63,7 +64,8 @@ def install(self, spec, prefix):
'-DOCE_DISABLE_X11:BOOL=ON', '-DOCE_DISABLE_X11:BOOL=ON',
'-DOCE_DRAW:BOOL=OFF', '-DOCE_DRAW:BOOL=OFF',
'-DOCE_MODEL:BOOL=ON', '-DOCE_MODEL:BOOL=ON',
'-DOCE_MULTITHREAD_LIBRARY:STRING=%s' % ('TBB' if '+tbb' in spec else 'NONE'), '-DOCE_MULTITHREAD_LIBRARY:STRING=%s' % (
'TBB' if '+tbb' in spec else 'NONE'),
'-DOCE_OCAF:BOOL=ON', '-DOCE_OCAF:BOOL=ON',
'-DOCE_USE_TCL_TEST_FRAMEWORK:BOOL=OFF', '-DOCE_USE_TCL_TEST_FRAMEWORK:BOOL=OFF',
'-DOCE_VISUALISATION:BOOL=OFF', '-DOCE_VISUALISATION:BOOL=OFF',
@ -77,15 +79,8 @@ def install(self, spec, prefix):
'-DOCE_OSX_USE_COCOA:BOOL=ON', '-DOCE_OSX_USE_COCOA:BOOL=ON',
]) ])
options.append('-DCMAKE_INSTALL_NAME_DIR:PATH=%s/lib' % prefix)
cmake('.', *options) cmake('.', *options)
make("install/strip") make("install/strip")
make("test")
# OCE tests build is brocken at least on Darwin.
# Unit tests are linked against libTKernel.10.dylib isntead of /full/path/libTKernel.10.dylib
# see https://github.com/tpaviot/oce/issues/612
# make("test")
# The shared libraries are not installed correctly on Darwin; correct this
if (sys.platform == 'darwin'):
fix_darwin_install_name(prefix.lib)