zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: makeCGAL with specified version installs into the wrong directory

Browse Source 
- 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.
This commit is contained in:
Mark Olesen
2022-04-08 09:42:05 +02:00
parent 525f3f4e67
commit ad69b472e6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makeCGAL
View File

@ -7,7 +7,7 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2012-2016 OpenFOAM Foundation # Copyright (C) 2012-2016 OpenFOAM Foundation
# Copyright (C) 2016-2021 OpenCFD Ltd. # Copyright (C) 2016-2022 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -472,7 +472,7 @@ fi
CGAL_SOURCE="$(findSourceDir "$CGAL_PACKAGE")" CGAL_SOURCE="$(findSourceDir "$CGAL_PACKAGE")"
CGAL_PACKAGE="$(basename "$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) # Override as per config file (if any)
[ -n "$CGAL_ARCH_PATH" ] && CGAL_PREFIX="$CGAL_ARCH_PATH" [ -n "$CGAL_ARCH_PATH" ] && CGAL_PREFIX="$CGAL_ARCH_PATH"