]> Creatis software - creaToolsTools.git/commitdiff
#3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64
authorEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Thu, 6 Dec 2018 14:39:42 +0000 (15:39 +0100)
committerEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Thu, 6 Dec 2018 14:39:42 +0000 (15:39 +0100)
Linux/scripts/CreaTools-compile.sh
Linux/scripts/creaVariables.sh

index cf35dd35316aa5e97d455cc19f6984998ebdc943..3cab2f5d72342c7eabcbe7f92a21e5aa0e147013 100644 (file)
@@ -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
index 93646d3e47e0483c3fb5dcb17c9b01d195574d7b..0f349678ff5ba0738a6e2de6a5f8f2858b02aac9 100644 (file)
 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