From 8afc630e96aca12bb47e8e85bac9f150b8e6f695 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 8 Sep 2018 16:18:37 -0500 Subject: [PATCH] =?UTF-8?q?assimp:=20fix=20compile=20issues=20with=20intel?= =?UTF-8?q?=20compilers=20on=20knl/linux=20[a=20depen=E2=80=A6=20(#9191)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * assimp: fix compile issues with intel compilers on knl/linux [a dependency for dealii] Fixes issue #9189 * assimp: add variant 'shared' with default value 'True' --- .../repos/builtin/packages/assimp/package.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 9e3687a95de..01b20b7da9f 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -34,8 +34,21 @@ class Assimp(CMakePackage): version('4.0.1', '23a6301c728a413aafbfa1cca19ba91f') + variant('shared', default=True, + description='Enables the build of shared libraries') + depends_on('boost') def cmake_args(self): - args = ['-DASSIMP_BUILD_TESTS=OFF'] + args = [ + '-DASSIMP_BUILD_TESTS=OFF', + '-DBUILD_SHARED_LIBS:BOOL=%s' % ( + 'ON' if '+shared' in self.spec else 'OFF'), + ] return args + + def flag_handler(self, name, flags): + flags = list(flags) + if name == 'cxxflags': + flags.append(self.compiler.cxx11_flag) + return (None, None, flags)