]> Creatis software - creaToolsTools.git/commitdiff
#3449 Bug compilation with OpenMP Mac
authorEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 20 Jul 2022 08:47:30 +0000 (10:47 +0200)
committerEduardo DAVILA <davila@creatis.insa-lyon.fr>
Wed, 20 Jul 2022 08:47:30 +0000 (10:47 +0200)
Linux/scripts/creaMaracasVariables.sh
Linux/scripts/creaVtkVariables.sh

index 853d5d448834fe1acbc12c9b6cda06138b7e6655..a833631e2134b70254554bf8b6e4169fa12f1198 100644 (file)
 # $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
index 66387ba377ce3f22040bed381a20c36520e6b7cb..86f1004eba8a17830fb2f8b3c1631796404d49c0 100644 (file)
 # $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