[gentoo-commits] dev/bicatali:master commit in: net-fs/cvmfs/

[Sebastien Fabbro]

commit:     9bea335ee39f856ccf6d021c00303fb2ef5d0e6c
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 19:20:44 2015 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 19:20:44 2015 +0000
URL:        https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=9bea335e

To install test, we need to build them

 net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild | 9 ++++++++-
 net-fs/cvmfs/cvmfs-9999.ebuild            | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild 
b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
index 00dc852..2bde18f 100644
--- a/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild
@@ -125,7 +125,6 @@ src_configure() {
                -DINSTALL_MOUNT_SCRIPTS=ON
                $(cmake-utils_use server BUILD_SERVER)
                $(cmake-utils_use test BUILD_UNITTESTS)
-               $(cmake-utils_use test-programs INSTALL_UNITTESTS)
        )
        if use debug; then
                mycmakeargs+=(
@@ -133,6 +132,14 @@ src_configure() {
                        $(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
                )
        fi
+       if use test-programs; then
+               mycmakeargs+=(
+                       -DBUILD_UNITTESTS=ON
+                       -DINSTALL_UNITTESTS=ON
+               )
+       else
+               mycmakeargs+=( -DINSTALL_UNITTESTS=OFF )
+       fi
        cmake-utils_src_configure
 }
 

diff --git a/net-fs/cvmfs/cvmfs-9999.ebuild b/net-fs/cvmfs/cvmfs-9999.ebuild
index 1f8aab8..bcf9821 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -115,7 +115,6 @@ src_configure() {
                $(cmake-utils_use doc BUILD_DOCUMENTATION)
                $(cmake-utils_use server BUILD_SERVER)
                $(cmake-utils_use test BUILD_UNITTESTS)
-               $(cmake-utils_use test-programs INSTALL_UNITTESTS)
        )
        if use debug; then
                mycmakeargs+=(
@@ -123,6 +122,14 @@ src_configure() {
                        $(cmake-utils_use test BUILD_UNITTESTS_DEBUG)
                )
        fi
+       if use test-programs; then
+               mycmakeargs+=(
+                       -DBUILD_UNITTESTS=ON
+                       -DINSTALL_UNITTESTS=ON
+               )
+       else
+               mycmakeargs+=( -DINSTALL_UNITTESTS=OFF )
+       fi
        cmake-utils_src_configure
 }