From f51a6422e91592162c3f144b2cb5259cc6d9eb11 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 20 Jul 2022 10:47:30 +0200 Subject: [PATCH] #3449 Bug compilation with OpenMP Mac --- Linux/scripts/creaMaracasVariables.sh | 21 ++++++++++----------- Linux/scripts/creaVtkVariables.sh | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh index 853d5d4..a833631 100644 --- a/Linux/scripts/creaMaracasVariables.sh +++ b/Linux/scripts/creaMaracasVariables.sh @@ -27,31 +27,30 @@ # $1 : bbtk # $2 : generationdir # $3 : ON/OFF (generate doc) +# $3 : TDx currentdir=$2 +TDx=$4 + binfolder=$2/creatools_bin/$1Bin + cd $binfolder if [ $OperatingSystem = "MacOS" ] then - cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++ - -## /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ - - fi + cmake -D CMAKE_CXX_COMPILER:FILE=/usr/bin/g++ +## /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -TDx=$4 - -# this line is not working in MacOs -#cxxFlags='-fPIC -fopenmp ' -cxxFlags='-fPIC -std=c++11 ' + cxxFlags='-fPIC -std=c++11 -Xclang -fopenmp=libomp ' + elif + cxxFlags='-fPIC -std=c++11 -fopenmp ' + fi # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then cxxFlags=$cxxFlags'-F/Library/Frameworks -DVTK_USE_TDX ' fi - cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags" CMakeCache.txt cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin CMakeCache.txt cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin CMakeCache.txt diff --git a/Linux/scripts/creaVtkVariables.sh b/Linux/scripts/creaVtkVariables.sh index 66387ba..86f1004 100644 --- a/Linux/scripts/creaVtkVariables.sh +++ b/Linux/scripts/creaVtkVariables.sh @@ -29,13 +29,21 @@ # $3 : ON/OFF (generate doc) currentdir=$2 +TDx=$4 + binfolder=$2/creatools_bin/$1Bin cd $binfolder -TDx=$4 -#This line es not working in MacOs -#cxxFlags='-fPIC -fopenmp ' -cxxFlags='-fPIC ' + + + if [ $OperatingSystem = "MacOS" ] + then + cxxFlags='-fPIC -Xclang -fopenmp=libomp ' + elif + cxxFlags='-fPIC -fopenmp ' + fi + + # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then -- 2.45.1