From ad69b472e6323c55630918c2ca1e3f1126355f1e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 8 Apr 2022 09:42:05 +0200 Subject: [PATCH] BUG: makeCGAL with specified version installs into the wrong directory - was applied precision-specific information: * instead of linux64Gcc [correct] * was using linux64GccInt32 [wrong] This problem does not the regular use where CGAL is defined from etc/config.sh/CGAL since the CGAL_ARCH_PATH specified there was properly respected. --- makeCGAL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makeCGAL b/makeCGAL index 4ad2dbb..c55cd59 100755 --- a/makeCGAL +++ b/makeCGAL @@ -7,7 +7,7 @@ # \\/ M anipulation | #------------------------------------------------------------------------------ # Copyright (C) 2012-2016 OpenFOAM Foundation -# Copyright (C) 2016-2021 OpenCFD Ltd. +# Copyright (C) 2016-2022 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later. @@ -472,7 +472,7 @@ fi CGAL_SOURCE="$(findSourceDir "$CGAL_PACKAGE")" CGAL_PACKAGE="$(basename "$CGAL_PACKAGE")" -CGAL_PREFIX="$installBASE$WM_SIZE_OPTIONS/$CGAL_PACKAGE" +CGAL_PREFIX="$installBASE/$CGAL_PACKAGE" # Override as per config file (if any) [ -n "$CGAL_ARCH_PATH" ] && CGAL_PREFIX="$CGAL_ARCH_PATH"