Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/
Date: Sat, 31 Jan 2015 20:19:29
Message-Id: 1422555640.514b1eb6c3e5cc0aea9972299107615324e900fb.ottxor@gentoo
1 commit: 514b1eb6c3e5cc0aea9972299107615324e900fb
2 Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
3 AuthorDate: Thu Jan 29 18:20:40 2015 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 29 18:20:40 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=514b1eb6
7
8 Test that CASROOT has been set; suggestion by @junghans
9
10 ---
11 sci-visualization/mantid/mantid-3.3.0.ebuild | 6 +++++-
12 1 file changed, 5 insertions(+), 1 deletion(-)
13
14 diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
15 index 16c3662..4e756e6 100644
16 --- a/sci-visualization/mantid/mantid-3.3.0.ebuild
17 +++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
18 @@ -75,8 +75,12 @@ src_configure() {
19 $(cmake-utils_use paraview MAKE_VATES)
20 $(cmake-utils_use_use pch PRECOMPILED_HEADERS)
21 $(cmake-utils_use_build test TESTING)
22 - -DCMAKE_PREFIX_PATH="${CASROOT}"
23 )
24 + if use opencascade
25 + then
26 + [[ -z ${CASROOT} ]] && die "CASROOT environment variable not defined, that usually means you need to use 'eselect opencascade'."
27 + mycmakeargs+=( -DCMAKE_PREFIX_PATH="${CASROOT}" )
28 + fi
29 cmake-utils_src_configure
30 }