From: Uwe Köcher Date: Mon, 21 Jun 2021 14:48:49 +0000 (+0200) Subject: Merge pull request #159 from tjhei/dealii_without_mpicxx X-Git-Tag: v9.3.3-r1~1^2~48 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6943d0d5a48b7d43b6beb86d4b1e21e2ebd706f;p=candi.git Merge pull request #159 from tjhei/dealii_without_mpicxx disable CXX/CC for deal.II itself --- c6943d0d5a48b7d43b6beb86d4b1e21e2ebd706f diff --cc deal.II-toolchain/packages/dealii.package index 5b06381,3db2b35..00f2228 --- a/deal.II-toolchain/packages/dealii.package +++ b/deal.II-toolchain/packages/dealii.package @@@ -43,8 -35,13 +45,13 @@@ f # add the user-specified flags at the end (so things can be overriden): CONFOPTS="${CONFOPTS} \ -${DEAL_CONFOPTS}" +${DEAL_II_CONFOPTS}" + # Disable CXX, CC for deal.II as recommended in + # https://github.com/dealii/dealii/issues/11478 . Note the we are + # setting the MPI_*_COMPILER cmake variables above. + unset CXX + unset CC ################################################################################ # Check if we hit cmake-3.10+ and deal.II v8.5.1 configure error (MPI / FindMPI)