From owner-dev-commits-ports-main@freebsd.org Sun Apr 25 13:23:39 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1532B6229DC; Sun, 25 Apr 2021 13:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSpd70139z3NDg; Sun, 25 Apr 2021 13:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E74541510F; Sun, 25 Apr 2021 13:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13PDNc9Z005873; Sun, 25 Apr 2021 13:23:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PDNc72005872; Sun, 25 Apr 2021 13:23:38 GMT (envelope-from git) Date: Sun, 25 Apr 2021 13:23:38 GMT Message-Id: <202104251323.13PDNc72005872@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: e3e220b283d6 - main - Mk/Uses/mpi.mk: fix CMAKE_ARGS when USES=cmake has arguments MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3e220b283d68098adaa668ef2701bc0cc022992 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 13:23:39 -0000 The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3e220b283d68098adaa668ef2701bc0cc022992 commit e3e220b283d68098adaa668ef2701bc0cc022992 Author: Thierry Thomas AuthorDate: 2021-04-25 13:21:21 +0000 Commit: Thierry Thomas CommitDate: 2021-04-25 13:23:18 +0000 Mk/Uses/mpi.mk: fix CMAKE_ARGS when USES=cmake has arguments --- Mk/Uses/mpi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/mpi.mk b/Mk/Uses/mpi.mk index c041cebeef27..62d86a289fd2 100644 --- a/Mk/Uses/mpi.mk +++ b/Mk/Uses/mpi.mk @@ -57,7 +57,7 @@ MPICXX= ${MPI_HOME}/bin/mpicxx MPIEXEC= ${MPI_HOME}/bin/mpiexec MPIRUN= ${MPI_HOME}/bin/mpirun -.if ${USES:Mcmake} +.if ${USES:Mcmake} || ${USES:Mcmake\:*} CMAKE_ARGS+= -DMPIEXEC_EXECUTABLE:FILEPATH="${MPIEXEC}" \ -DMPI_HOME:PATH="${MPI_HOME}" .endif