#3226 creaToolsTools Feature New Normal - branchvtk8itk4wx3-macos

diff --git a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
index 17b394f3933eb61d45f89c3d7ae19e4f4e7a7032..52fed20126b4c13eeb7de94e568ac531e3973d7a 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
@@ -52,7 +52,7 @@ IF %4==Debug (
 
 %cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_DOC:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=%3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=%3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=%3 CMakeCache.txt
-%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
+%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive -std=c++11" CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
 exit /B

diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index 5d496fba6eff70c71d564899659431a12d0c76a9..25ddfa444db10b82b3393dc8bc9cce053899b43f 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -156,7 +156,6 @@ then
      port -N install texlive              -y
      port -N install latex2html           -y
      port -N install wxWidgets-3.0        -y
-     port -N install wxgtk-3.0           -y
      port -N install boost                -y
 #     ln -s libboost_signals-xgcc40-mt-1_38.dylib    libboost_signals.dylib    /opt/local/lib # cf EED : http://www.creatis.insa-lyon.fr/site
 #     ln -s libboost_signals-xgcc40-mt-1_38.dylib    libboost_signals.dylib    /opt/local/lib # cf EED

diff --git a/Linux/scripts/creaMaracasVariables.sh b/Linux/scripts/creaMaracasVariables.sh
index 26da6307e09fec71b58f66d208578e2a5a5f29e0..5156a7de467e05661daba5b9b2463294a1a5a22c 100644 (file)
--- a/Linux/scripts/creaMaracasVariables.sh
+++ b/Linux/scripts/creaMaracasVariables.sh
@@ -32,6 +32,13 @@ currentdir=$2
 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_FLAGS:STRING=-fPIC -D CMAKE_CXX_FLAGS:STRING=-fopenmp       CMakeCache.txt
 cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin                               CMakeCache.txt

diff --git a/Linux/scripts/creaVariables.sh b/Linux/scripts/creaVariables.sh
index e674dce6ccf41f0c28e956a65fc7260072e9a03f..93646d3e47e0483c3fb5dcb17c9b01d195574d7b 100644 (file)
--- a/Linux/scripts/creaVariables.sh
+++ b/Linux/scripts/creaVariables.sh
@@ -31,7 +31,13 @@
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D CMAKE_CXX_FLAGS:STRING=-fPIC  -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt
+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
 cmake CMakeCache.txt
 cmake CMakeCache.txt