diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-05-21 13:53:34 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-05-21 15:03:50 +0200 |
commit | 7b27f5b52fe1e215e3e203415b3ca833843fe63f (patch) | |
tree | b6ec63f4e41e2c6555f8b65c9ecf092905ab2cf9 /eclass | |
parent | cmake-utils.eclass: Remove PREFIX variable (diff) | |
download | kde-7b27f5b52fe1e215e3e203415b3ca833843fe63f.tar.gz kde-7b27f5b52fe1e215e3e203415b3ca833843fe63f.tar.bz2 kde-7b27f5b52fe1e215e3e203415b3ca833843fe63f.zip |
cmake-utils.eclass: Drop _cmake_execute_optionally after WANT_CMAKE
Follow-up to d741b4ef5054c8800b97748ef8caa11ad910d784
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/cmake-utils.eclass | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 08057d812d..faf6cdb0b7 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -743,7 +743,7 @@ enable_cmake-utils_src_install() { # @DESCRIPTION: # Apply ebuild and user patches. cmake-utils_src_prepare() { - _cmake_execute_optionally "src_prepare" "$@" + enable_cmake-utils_src_prepare "$@" } # @FUNCTION: cmake-utils_src_configure @@ -751,7 +751,7 @@ cmake-utils_src_prepare() { # General function for configuring with cmake. Default behaviour is to start an # out-of-source build. cmake-utils_src_configure() { - _cmake_execute_optionally "src_configure" "$@" + enable_cmake-utils_src_configure "$@" } # @FUNCTION: cmake-utils_src_compile @@ -759,31 +759,21 @@ cmake-utils_src_configure() { # General function for compiling with cmake. # Automatically detects the build type. All arguments are passed to emake. cmake-utils_src_compile() { - _cmake_execute_optionally "src_compile" "$@" + enable_cmake-utils_src_compile "$@" } # @FUNCTION: cmake-utils_src_test # @DESCRIPTION: # Function for testing the package. Automatically detects the build type. cmake-utils_src_test() { - _cmake_execute_optionally "src_test" "$@" + enable_cmake-utils_src_test "$@" } # @FUNCTION: cmake-utils_src_install # @DESCRIPTION: # Function for installing the package. Automatically detects the build type. cmake-utils_src_install() { - _cmake_execute_optionally "src_install" "$@" -} - -# Optionally executes phases based on WANT_CMAKE variable/USE flag. -_cmake_execute_optionally() { - local phase="$1" ; shift - if [[ ${WANT_CMAKE} = always ]]; then - enable_cmake-utils_${phase} "$@" - else - use ${WANT_CMAKE} && enable_cmake-utils_${phase} "$@" - fi + enable_cmake-utils_src_install "$@" } fi |