From: Eduardo DAVILA Date: Wed, 3 Aug 2022 11:14:20 +0000 (+0200) Subject: #3451 OpenMP MacOs X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=21e2109b0a5c961ff6ae4227f32a19baa5fed098;p=creaToolsTools.git #3451 OpenMP MacOs --- diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh index ae1503e..201b93b 100644 --- a/Linux/scripts/CreaTools-load.sh +++ b/Linux/scripts/CreaTools-load.sh @@ -72,7 +72,6 @@ then mkdir -p $generationdir mkdir -p $generationdir/creatools_source mkdir -p $generationdir/creatools_bin - mkdir -p $generationdir/creatools_install fi cd $generationdir @@ -88,7 +87,7 @@ if [ true = true ] then rm -rf creatools_source rm -rf creatools_bin - rm -rf creatools_install + rm -rf ci mkdir -p $generationdir/creatools_source fi fi @@ -124,31 +123,31 @@ then # mv $libidosource-ESRF $libidosource cd $generationdir/creatools_source/$creasource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$bbtksource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creavtksource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creamaracassource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creabrukersource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creaimagesource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creacontourssource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$crearigidregistrationssource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$bbtkgeditorsource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creatoolssource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creaenvironmentsource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creaminitoolssource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos cd $generationdir/creatools_source/$creatoolstoolssource - git checkout vtk8itk5wx3-macos + git checkout vtk9itk5wx3-macos fi if [ $sourcesFrom = HTML ] diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh index a833631..8af85cc 100644 --- a/Linux/scripts/creaMaracasVariables.sh +++ b/Linux/scripts/creaMaracasVariables.sh @@ -36,19 +36,11 @@ 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++ - - cxxFlags='-fPIC -std=c++11 -Xclang -fopenmp=libomp ' - elif - cxxFlags='-fPIC -std=c++11 -fopenmp ' - fi +cxxFlags='-fPIC ' # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then - cxxFlags=$cxxFlags'-F/Library/Frameworks -DVTK_USE_TDX ' + cxxFlags=$cxxFlags' -F/Library/Frameworks -DVTK_USE_TDX ' fi cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags" CMakeCache.txt diff --git a/Linux/scripts/creaVtkVariables.sh b/Linux/scripts/creaVtkVariables.sh index 86f1004..16f9cc0 100644 --- a/Linux/scripts/creaVtkVariables.sh +++ b/Linux/scripts/creaVtkVariables.sh @@ -34,20 +34,11 @@ TDx=$4 binfolder=$2/creatools_bin/$1Bin cd $binfolder - - - if [ $OperatingSystem = "MacOS" ] - then - cxxFlags='-fPIC -Xclang -fopenmp=libomp ' - elif - cxxFlags='-fPIC -fopenmp ' - fi - - +cxxFlags='-fPIC ' # TDx is declared in: CreaTools-configure.sh if [ "$TDx" == "ON" ]; then - cxxFlags=$cxxFlags'-F/Library/Frameworks ' + cxxFlags=$cxxFlags' -F/Library/Frameworks ' fi cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags" CMakeCache.txt