Merge branch 'vtk8itk5wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/creaToolsTools...

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
index 7e2febb2a7f06e790ecf2c964ce2b5ff22e186f5..73b6f5977a3d79b2dd9904871448247c6b613ece 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
@@ -52,7 +52,8 @@ echo %1=creabrukersource% %2=docgeneration
 
 %cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaEnvironment_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaImageIO_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
-%cmakeBin% -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
+%cmakeBin%  -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON  -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%3  CMakeCache.txt
+%cmakeBin% -D creaContours_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
 

diff --git a/Linux/scripts/ThirdParty-install-Base-rpm.sh b/Linux/scripts/ThirdParty-install-Base-rpm.sh
index 465a1ee74e2ac0d300f07020b3bbe6d0d130445c..71af642fe966d8134d792a56d9f1473a54c7f882 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-rpm.sh
+++ b/Linux/scripts/ThirdParty-install-Base-rpm.sh
@@ -128,10 +128,15 @@ then
      apt-get --yes install graphviz
      apt-get --yes install texlive
      apt-get --yes install latex2html
-     apt-get --yes install libgtk2.0-dev #GTK
-     apt-get --yes install libwxgtk2.8-dev #Wx GTK
-     apt-get --yes install libwxbase2.8-dev #Wx solito
+
+#     apt-get --yes install libgtk2.0-dev #GTK
+     apt-get --yes install libgtk-3-dev #GTK
+#     apt-get --yes install libwxgtk2.8-dev #Wx GTK
+     apt-get --yes install libwxgtk3.0-dev #Wx GTK
+#     apt-get --yes install libwxbase2.8-dev #Wx solito
+     apt-get --yes install libwxbase3.0-dev #Wx solito
      apt-get --yes install wx-common #wxrc
+
      apt-get --yes install libboost-dev  #Boost
      apt-get --yes install libboost-all-dev #Boost
      apt-get --yes install libqt4-dev #QT4