From cd876d0e4c7062f5e0f164482eb51f73f05b7ae4 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Fri, 1 Apr 2011 09:54:31 +0000 Subject: [PATCH] build itk against installed gdcm! --- Linux/menu.sh | 30 ++++++++++++++++++++++++++++- Linux/scripts/CreaTools-install.sh | 4 ++++ Linux/scripts/ThirdParty-install.sh | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Linux/menu.sh b/Linux/menu.sh index 2a40e06..fba2b71 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -18,7 +18,16 @@ do echo " Choose what you want to do :" echo echo " Configure :........................0" - echo " Install Third Party Libraries :....1 (as root)" + + if [ $expanded = "YES" ] + then + echo " Get and Compile gdcm :.. ......1.1" + echo " Get and Compile itk :.. .......1.2" + echo " Get and Compile vtk :.. .......1.3" + else + echo " Install Third Party Libraries :....1 (as root)" + fi + if [ $expanded = "YES" ] then echo " Get the 'CreaTools' source files :.2.1 (CVS : as user!)" @@ -350,6 +359,25 @@ do read a kill $PPID ;; + + 1.1) + echo "========================== 1.1 " + source scripts/Check-if-root.sh + bash scripts/ThirdParty-install-gdcm.sh + ;; + + 1.2) + echo "========================== 1.2 " + echo "sorry, not yet available" + read a + ;; + + 1.3) + echo "========================== 1.3 " + echo "sorry, not yet available" + read a + + ;; 2) #2.1 diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 6ea2d1b..c851520 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -72,6 +72,10 @@ export ETC_BASHRC=$HOME/.bashrc bash installmod.sh $buildType $bbtkgeditorsource $generationdir $installPrefix bash installmod.sh $buildType $creatoolssource $generationdir $installPrefix + #should be nice to add bbwx, too. (?) // JPR + //bash installmod.sh $buildType bbwx $generationdir $installPrefix + + echo installPrefixtmp=$installPrefix >> $ETC_BASHRC echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] && source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index 1b89387..d986ee1 100644 --- a/Linux/scripts/ThirdParty-install.sh +++ b/Linux/scripts/ThirdParty-install.sh @@ -209,6 +209,7 @@ then ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt + cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt cmake CMakeCache.txt make -j 2 make install -- 2.45.1