Date: Sun, 23 Oct 2022 07:52:38 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2a6e08e253d0 - main - science/trilinos: Conflicts with googletest Message-ID: <202210230752.29N7qcug028990@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a6e08e253d04fb167269043f4c74a192758682b commit 2a6e08e253d04fb167269043f4c74a192758682b Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-10-23 07:51:03 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-10-23 07:52:32 +0000 science/trilinos: Conflicts with googletest PR: 267283 Reported by: diizzy@ --- science/trilinos/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/science/trilinos/Makefile b/science/trilinos/Makefile index d113106d4211..38d73ac407fb 100644 --- a/science/trilinos/Makefile +++ b/science/trilinos/Makefile @@ -76,6 +76,8 @@ CMAKE_ARGS+= -DAMD_LIBRARY_DIRS=${LOCALBASE}/lib # users: https://duongdo27.github.io/Trilinos/users.html +CONFLICTS_INSTALL= googletest # installs files into the same place, problematic file: /usr/local/include/gtest/gtest.h, see https://github.com/trilinos/Trilinos/issues/11184 + post-install: # remove MPI headers that it installs @${RM} ${STAGEDIR}${PREFIX}/include/mpi*.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210230752.29N7qcug028990>