[gentoo-commits] gentoo-x86 commit in eclass: mysql-cmake.eclass

[Robin H. Johnson (robbat2)]

robbat2     11/12/27 07:34:18

  Modified:             mysql-cmake.eclass
  Log:
  Refactor USE=static cmake code.

Revision  Changes    Path
1.3                  eclass/mysql-cmake.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.2&r2=1.3

Index: mysql-cmake.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- mysql-cmake.eclass	30 Sep 2011 02:10:24 -0000	1.2
+++ mysql-cmake.eclass	27 Dec 2011 07:34:18 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.2 2011/09/30 02:10:24 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.3 2011/12/27 07:34:18 robbat2 Exp $
 
 # @ECLASS: mysql-cmake.eclass
 # @MAINTAINER:
@@ -123,13 +123,8 @@ configure_cmake_standard() {
 		-DWITHOUT_LIBWRAP=1
 	)
 
-	if use static ; then
-		mycmakeargs+=( -DDISABLE_SHARED=1 )
-	else
-		mycmakeargs+=( -DDISABLED_SHARED=0 )
-	fi
-
 	mycmakeargs+=(
+		$(cmake-utils_use_disable !static SHARED)
 		$(cmake-utils_use_with debug)
 		$(cmake-utils_use_with embedded EMBEDDED_SERVER)
 		$(cmake-utils_use_with profiling)