From: Eduardo DAVILA Date: Thu, 22 Dec 2016 09:56:10 +0000 (+0100) Subject: #3044 creaToolsTools Bug New Normal - Fedora 24 ThirdParty library conflict with... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fa4fbd3991c17689ef149ac73c69cdd00c0e64a0;p=creaToolsTools.git #3044 creaToolsTools Bug New Normal - Fedora 24 ThirdParty library conflict with gcc6 --- diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh index cdc2681..c6e456e 100644 --- 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 a6a63fb..6621550 100644 --- 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 9ddfaef..9d09d2b 100644 --- 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 b6a3951..9445e2b 100644 --- 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