From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 808E71384B4 for ; Wed, 4 Nov 2015 12:34:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D35221C064; Wed, 4 Nov 2015 12:34:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B44EB21C064 for ; Wed, 4 Nov 2015 12:34:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EC2D3406BF for ; Wed, 4 Nov 2015 12:34:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EB651F0D for ; Wed, 4 Nov 2015 12:34:38 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1446640467.7f03821876f1a7884396057f315013c3622b4609.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 7f03821876f1a7884396057f315013c3622b4609 X-VCS-Branch: master Date: Wed, 4 Nov 2015 12:34:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 816c4d5d-6ab5-4176-984b-ad9b10536730 X-Archives-Hash: 95c3b8e5d1542d2149d0a91bdf4425a7 commit: 7f03821876f1a7884396057f315013c3622b4609 Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 3 12:41:04 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Nov 4 12:34:27 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f038218 cmake-utils.eclass: Prepare for cmake-3.4 eclass/cmake-utils.eclass | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index c92759d..2ebde45 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -121,7 +121,7 @@ case ${WANT_CMAKE} in CMAKEDEPEND+="${WANT_CMAKE}? ( " ;; esac -inherit toolchain-funcs multilib flag-o-matic eutils +inherit toolchain-funcs multilib flag-o-matic eutils versionator case ${EAPI} in 2|3|4|5) : ;; @@ -461,12 +461,22 @@ enable_cmake-utils_src_configure() { # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${BUILD_DIR}/gentoo_rules.cmake + # Since cmake-3.4.0_rc1 "" no longer contains includes and thus + # we need to add "" + local includes= + if [[ ${PN} == cmake ]] ; then + if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then + includes="" + fi + elif has_version \>=dev-util/cmake-3.4.0_rc1 ; then + includes="" + fi cat > "${build_rules}" <<- _EOF_ || die SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) - SET (CMAKE_ASM_COMPILE_OBJECT " ${CFLAGS} -o -c " CACHE STRING "ASM compile command" FORCE) - SET (CMAKE_C_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) - SET (CMAKE_CXX_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C++ compile command" FORCE) - SET (CMAKE_Fortran_COMPILE_OBJECT " ${FCFLAGS} -o -c " CACHE STRING "Fortran compile command" FORCE) + SET (CMAKE_ASM_COMPILE_OBJECT " ${includes} ${CFLAGS} -o -c " CACHE STRING "ASM compile command" FORCE) + SET (CMAKE_C_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) + SET (CMAKE_CXX_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "C++ compile command" FORCE) + SET (CMAKE_Fortran_COMPILE_OBJECT " ${includes} ${FCFLAGS} -o -c " CACHE STRING "Fortran compile command" FORCE) SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE) _EOF_