1 |
commit: 084e045c4ba8a1f3ecc9f480cf4a93fef3b28451 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 5 08:53:42 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 5 12:19:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084e045c |
7 |
|
8 |
dev-cpp/catch: Install using CMake |
9 |
|
10 |
dev-cpp/catch/catch-1.9999.ebuild | 17 ++++++----------- |
11 |
dev-cpp/catch/catch-9999.ebuild | 17 ++++++----------- |
12 |
2 files changed, 12 insertions(+), 22 deletions(-) |
13 |
|
14 |
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild |
15 |
index b6b3d982a71..4cad4e13c4b 100644 |
16 |
--- a/dev-cpp/catch/catch-1.9999.ebuild |
17 |
+++ b/dev-cpp/catch/catch-1.9999.ebuild |
18 |
@@ -14,21 +14,16 @@ SRC_URI="" |
19 |
LICENSE="Boost-1.0" |
20 |
SLOT="0" |
21 |
KEYWORDS="" |
22 |
-IUSE="" |
23 |
+IUSE="test" |
24 |
|
25 |
-# CMake is only used to build & run tests, so override phases |
26 |
-src_configure() { :; } |
27 |
-src_compile() { :; } |
28 |
- |
29 |
-src_test() { |
30 |
+src_configure() { |
31 |
+ local mycmakeargs=( |
32 |
+ -DNO_SELFTEST=$(usex !test) |
33 |
+ ) |
34 |
cmake-utils_src_configure |
35 |
- cmake-utils_src_compile |
36 |
- cmake-utils_src_test |
37 |
} |
38 |
|
39 |
src_install() { |
40 |
- # same location as used in fedora |
41 |
- insinto /usr/include/catch |
42 |
- doins -r include/. |
43 |
+ cmake-utils_src_install |
44 |
dodoc -r docs/. |
45 |
} |
46 |
|
47 |
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild |
48 |
index 41195675fe3..5a244d42728 100644 |
49 |
--- a/dev-cpp/catch/catch-9999.ebuild |
50 |
+++ b/dev-cpp/catch/catch-9999.ebuild |
51 |
@@ -13,21 +13,16 @@ SRC_URI="" |
52 |
LICENSE="Boost-1.0" |
53 |
SLOT="0" |
54 |
KEYWORDS="" |
55 |
-IUSE="" |
56 |
+IUSE="test" |
57 |
|
58 |
-# CMake is only used to build & run tests, so override phases |
59 |
-src_configure() { :; } |
60 |
-src_compile() { :; } |
61 |
- |
62 |
-src_test() { |
63 |
+src_configure() { |
64 |
+ local mycmakeargs=( |
65 |
+ -DNO_SELFTEST=$(usex !test) |
66 |
+ ) |
67 |
cmake-utils_src_configure |
68 |
- cmake-utils_src_compile |
69 |
- cmake-utils_src_test |
70 |
} |
71 |
|
72 |
src_install() { |
73 |
- # same location as used in fedora |
74 |
- insinto /usr/include/catch |
75 |
- doins -r include/. |
76 |
+ cmake-utils_src_install |
77 |
dodoc -r docs/. |
78 |
} |