From 633ea27369398159baef0f3e0442967097a65754 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 6 Dec 2018 15:39:42 +0100 Subject: [PATCH] #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 --- Linux/scripts/CreaTools-compile.sh | 1 + Linux/scripts/creaVariables.sh | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index cf35dd3..3cab2f5 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -135,6 +135,7 @@ then #if [ true = false ] if [ true = true ] then + bash $scriptDir/cmakemod.sh $creasource $generationdir $installPrefix $buildType bash $scriptDir/creaVariables.sh $creasource $generationdir $docgeneration bash $scriptDir/compilemod.sh $buildType $creasource $generationdir $corenumber diff --git a/Linux/scripts/creaVariables.sh b/Linux/scripts/creaVariables.sh index 93646d3..0f34967 100644 --- a/Linux/scripts/creaVariables.sh +++ b/Linux/scripts/creaVariables.sh @@ -31,13 +31,15 @@ binfolder=$2/creatools_bin/$1Bin cd $binfolder -IF(APPLE) - set(cxxFlags -fPI -ObjC++C) -ELSE(APPLE) - set(cxxFlags -fPI) -ENDIF(APPPLE) -cmake -D CMAKE_CXX_FLAGS:STRING=${cxxFlags} -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt +if [[ "$OSTYPE" == "linux-gnu" ]]; then + cxxFlags='-fPIC' +elif [[ "$OSTYPE" == "darwin" ]]; then + cxxFlags='-fPIC -ObjC++C' +fi + + +cmake -D CMAKE_CXX_FLAGS:STRING=$cxxFlags -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt cmake CMakeCache.txt cmake CMakeCache.txt -- 2.47.1