diff --git a/programming/misc/intel-tbb/actions.py b/programming/misc/intel-tbb/actions.py index 6c3d434039..27b4645bab 100644 --- a/programming/misc/intel-tbb/actions.py +++ b/programming/misc/intel-tbb/actions.py @@ -1,23 +1,24 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -from pisi.actionsapi import get -from pisi.actionsapi import autotools +from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools +from pisi.actionsapi import autotools from pisi.actionsapi import shelltools - - -#WorkDir="tbb%soss" % (get.srcVERSION().replace(".", "")) -WorkDir="oneTBB-%s" % get.srcVERSION() - +from pisi.actionsapi import get def build(): autotools.make("CXXFLAGS='%s' tbb_build_prefix=obj" % get.CXXFLAGS()) def install(): shelltools.system("./install.sh %s" % get.installDIR()) + shelltools.system("cmake \ + -DINSTALL_DIR='%s'/usr/lib/cmake/TBB \ + -DSYSTEM_NAME=Linux \ + -DTBB_VERSION_FILE='%s'/usr/include/tbb/tbb_stddef.h \ + -P cmake/tbb_config_installer.cmake" % (get.installDIR(), get.installDIR())) - pisitools.dodoc("README") + pisitools.dodoc("README*") diff --git a/programming/misc/intel-tbb/pspec.xml b/programming/misc/intel-tbb/pspec.xml index 2ffe80d816..a9584f1f3a 100644 --- a/programming/misc/intel-tbb/pspec.xml +++ b/programming/misc/intel-tbb/pspec.xml @@ -16,6 +16,9 @@ install.sh + + cmake +