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

[Sebastien Fabbro]

commit:     a610f9d9280fa44d958af0c5c9ce18fa042c5fdc
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 20:33:07 2015 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 20:33:07 2015 +0000
URL:        https://gitweb.gentoo.org/dev/bicatali.git/commit/?id=a610f9d9

Remove conflict between two cmake flags

 net-fs/cvmfs/cvmfs-2.1.20.0_p05-r2.ebuild | 13 ++++---------
 net-fs/cvmfs/cvmfs-9999.ebuild            | 13 ++++---------
 2 files changed, 8 insertions(+), 18 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 2bde18f..1f14695 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
@@ -124,22 +124,17 @@ src_configure() {
                -DBUILD_LIBCVMFS=ON
                -DINSTALL_MOUNT_SCRIPTS=ON
                $(cmake-utils_use server BUILD_SERVER)
-               $(cmake-utils_use test BUILD_UNITTESTS)
        )
+       if use test || use test-programs; then
+               mycmakeargs+=( -DBUILD_UNITTESTS=ON )
+       fi
+       use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON )
        if use debug; then
                mycmakeargs+=(
                        $(cmake-utils_use server BUILD_SERVER_DEBUG)
                        $(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 bcf9821..0a47788 100644
--- a/net-fs/cvmfs/cvmfs-9999.ebuild
+++ b/net-fs/cvmfs/cvmfs-9999.ebuild
@@ -114,22 +114,17 @@ src_configure() {
                -DINSTALL_MOUNT_SCRIPTS=ON
                $(cmake-utils_use doc BUILD_DOCUMENTATION)
                $(cmake-utils_use server BUILD_SERVER)
-               $(cmake-utils_use test BUILD_UNITTESTS)
        )
+       if use test || use test-programs; then
+               mycmakeargs+=( -DBUILD_UNITTESTS=ON )
+       fi
+       use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON )
        if use debug; then
                mycmakeargs+=(
                        $(cmake-utils_use server BUILD_SERVER_DEBUG)
                        $(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
 }