#3044 creaToolsTools Bug New Normal - Fedora 24 ThirdParty library conflict with...

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index cdc26815e70054a98555b218f448db7a9b57553b..c6e456e4c4217ff8783774bc80eccc0b06f9d323 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -164,10 +164,12 @@ then
   then
      cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D  ITKGroup_IO:BOOL=ON  -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON  CMakeCache.txt        
   fi
+  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+
   #uncomment following line if you want to use the bleeding edge of GDCM2!
   #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt
   cmake CMakeCache.txt
-  make -j $corenumber
+  make -j 
   make install
   cd ..
 fi

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index a6a63fb489ca1e1a2843cbbc56c8c482040444bb..66215502b41635f2eecb17c936a7d62b4ae8801b 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -128,6 +128,11 @@ pwd
 ##EED19mai2015  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
   wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkXOpenGLRenderWindow.patch
   patch < vtk-5.10.1.vtkXOpenGLRenderWindow.patch
+
+  cd ../CMake
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/vtk-5.10.1.vtkCompilerExtras.cmake-PATCH
+  patch < vtk-5.10.1.vtkCompilerExtras.cmake-PATCH 
+
  fi
 
 
@@ -170,7 +175,10 @@ then
   fi
 
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-  make -j $corenumber
+  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+
+##EED 2016-12-22  make -j $corenumber
+  make -j
   make install
   cd ..
 fi

diff --git a/Linux/scripts/ThirdParty-install-WT.sh b/Linux/scripts/ThirdParty-install-WT.sh
index 9ddfaefad8ff82b2ce635c04efa083ee3d9f2591..9d09d2ba185d44df27f5cb3f40a483f33bed8db0 100644 (file)
--- a/Linux/scripts/ThirdParty-install-WT.sh
+++ b/Linux/scripts/ThirdParty-install-WT.sh
@@ -148,7 +148,7 @@ then
 #     ###
 #  fi
 
-  make -j $corenumber
+  make -j
   su -c 'make install'
   cd ..
 fi

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index b6a3951a9a73b04e74a974015a2752022d7bc3da..9445e2b6c35e1156f7e8b357df43b0a9c0ee881a 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -130,7 +130,8 @@ then
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
-  make -j $corenumber
+  cmake -D CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
+  make -j
   make install
   cd ..
 fi