conflict gdcmvtk and other version of vtk

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

diff --git a/Install/creatools.bat b/Install/creatools.bat
new file mode 100644 (file)
index 0000000..3b472ab
--- /dev/null
+++ b/Install/creatools.bat
@@ -0,0 +1,10 @@
+@echo off
+set creatoolsGeneration=E:\creatis\creaToolsCompilation4
+set docGeneration=OFF
+
+cd scripts
+call All.bat %creatoolsGeneration% %docGeneration% 
+cd ..
+pause
+exit
+

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 3bf17f791a8f1d51dc430b75bf10a5c93e87de16..766a75039ffb693513808e43320095a05570f55e 100644 (file)
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -44,15 +44,14 @@ cd %scriptsFolder%
 call All2.bat %creatoolsGeneration% %docGeneration% Release Win64
 
 cd %scriptsFolder%
-call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64
+call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 
 
 cd %scriptsFolder%
-call All2.bat %creatoolsGeneration% %docGeneration% Release Win32 
+call All2.bat %creatoolsGeneration% %docGeneration% Debug Win64
 
 cd %scriptsFolder%
 call All2.bat %creatoolsGeneration% %docGeneration% Debug Win32
 
-
 echo ..End..
 
 cd %scriptsFolder%

diff --git a/Install/scripts/All2.bat b/Install/scripts/All2.bat
index 746210528a05b118666106b9d79087327a98158c..3beee4bad607b0e0715056fcbd646553ee6f1a43 100644 (file)
--- a/Install/scripts/All2.bat
+++ b/Install/scripts/All2.bat
@@ -46,17 +46,17 @@ mkdir creatools_%buildtype%%platforme%\installLog
 echo call configure variables
 call %scriptsFolder%\base\configureVariables.bat
 
-REM  goto skypToEED
-REM  :skypToEED
-
+REM goto skypToEED
+REM :skypToEED
 
 echo call compile crea
-echo start /B /wait %scriptsFolder%\crea\creaInstall.bat
 start /B /wait %scriptsFolder%\crea\creaInstall.bat
 echo call compile bbtk
 start /B /wait %scriptsFolder%\bbtk\bbtkInstall.bat
 echo call compile creaMaracasVisu
 start /B /wait %scriptsFolder%\creaMaracasVisu\creaMaracasVisuInstall.bat
+echo call compile creaVtk
+start /B /wait %scriptsFolder%\creaMaracasVisu\creaVtkInstall.bat
 echo call compile creaEnvironment
 start /B /wait %scriptsFolder%\creaEnvironment\creaEnvironmentInstall.bat
 echo call compile creaBruker
@@ -73,6 +73,7 @@ echo call compile creaMinitools
 start /B /wait %scriptsFolder%\creaTools\creaMinitoolsInstall.bat
 
 
+
 echo  THIS HAS TO BE THE LAST STEP...
 echo call compile creaTools
 start /B /wait %scriptsFolder%\creaTools\creaToolsInstall.bat

diff --git a/Install/scripts/base/configureVariables.bat b/Install/scripts/base/configureVariables.bat
index 15a115a3a0800c083910ea84569c382443f2c613..98980395afc767ace9b43bd56e36727254a25b60 100644 (file)
--- a/Install/scripts/base/configureVariables.bat
+++ b/Install/scripts/base/configureVariables.bat
@@ -28,6 +28,7 @@ echo setting variables
 set creasource=crea
 set bbtksource=bbtk
 set creamaracassource=creaMaracasVisu
+set creavtksource=creaVtk
 set creaenvironmentsource=creaEnvironment
 set creabrukersource=creaBruker
 set creaimagesource=creaImageIO
@@ -44,6 +45,8 @@ set bbtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin
 set PATH=%bbtkdll%;%PATH%
 set creamaracasdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creamaracassource%Bin\%buildtype%
 set PATH=%creamaracasdll%;%PATH%
+set creavtkdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creavtkssource%Bin\%buildtype%
+set PATH=%creavtkdll%;%PATH%
 set creaenvironmentdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creaenvironmentsource%Bin\%buildtype%
 set PATH=%creaenvironmentdll%;%PATH%
 set creabrukerdll=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_bin\%creabrukersource%Bin\%buildtype%

diff --git a/Install/scripts/base/downloadSources.bat b/Install/scripts/base/downloadSources.bat
index ed5b1ca8d3251724f78fe6d29a9e0d0111af91ed..62167c0bd5926ea53d03ebc701f577d70eb67a1c 100644 (file)
--- a/Install/scripts/base/downloadSources.bat
+++ b/Install/scripts/base/downloadSources.bat
@@ -36,6 +36,7 @@ echo cd %creatoolsGeneration2%/creatools_sources    >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource%  >> tmp.sh
+echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaVtk%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource%  >> tmp.sh
 echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource%  >> tmp.sh

diff --git a/Install/scripts/creaVtk/creaVtkInstall.bat b/Install/scripts/creaVtk/creaVtkInstall.bat
new file mode 100644 (file)
index 0000000..890f89d
--- /dev/null
+++ b/Install/scripts/creaVtk/creaVtkInstall.bat
@@ -0,0 +1,36 @@
+REM ---------------------------------------------------------------------
+REM
+REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+REM                        pour la Santé)
+REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+REM
+REM  This software is governed by the CeCILL-B license under French law and 
+REM  abiding by the rules of distribution of free software. You can  use, 
+REM  modify and/ or redistribute the software under the terms of the CeCILL-B 
+REM  license as circulated by CEA, CNRS and INRIA at the following URL 
+REM  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+REM  or in the file LICENSE.txt.
+REM
+REM  As a counterpart to the access to the source code and  rights to copy,
+REM  modify and redistribute granted by the license, users are provided only
+REM  with a limited warranty  and the software's author,  the holder of the
+REM  economic rights,  and the successive licensors  have only  limited
+REM  liability. 
+REM
+REM  The fact that you are presently reading this means that you have had
+REM  knowledge of the CeCILL-B license and that you accept its terms.
+REM ------------------------------------------------------------------------  
+
+@echo off
+
+set currentdir=%~dp0
+
+echo compile creaVtk  %buildtype% %platforme%
+call %baseFolder%\cleanmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
+call %baseFolder%\cmakemod.bat %creamaracassource%  %installPrefix% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
+call %currentdir%\creaVtkVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration% %buildtype% >> %logFolder%\creaVtkInstall.log 2>&1
+call %baseFolder%\compilemod.bat %buildtype% %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkInstall.log 2>&1
+call %baseFolder%\ctestmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaVtkVisuInstall.log 2>&1
+echo end of creaVtk compilation
+
+exit
\ No newline at end of file

diff --git a/Install/scripts/creaVtk/creaVtkVariables.bat b/Install/scripts/creaVtk/creaVtkVariables.bat
new file mode 100644 (file)
index 0000000..cdc3e9d
--- /dev/null
+++ b/Install/scripts/creaVtk/creaVtkVariables.bat
@@ -0,0 +1,44 @@
+REM ---------------------------------------------------------------------
+REM
+REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+REM                        pour la Santé)
+REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+REM
+REM  This software is governed by the CeCILL-B license under French law and 
+REM  abiding by the rules of distribution of free software. You can  use, 
+REM  modify and/ or redistribute the software under the terms of the CeCILL-B 
+REM  license as circulated by CEA, CNRS and INRIA at the following URL 
+REM  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+REM  or in the file LICENSE.txt.
+REM
+REM  As a counterpart to the access to the source code and  rights to copy,
+REM  modify and redistribute granted by the license, users are provided only
+REM  with a limited warranty  and the software's author,  the holder of the
+REM  economic rights,  and the successive licensors  have only  limited
+REM  liability. 
+REM
+REM  The fact that you are presently reading this means that you have had
+REM  knowledge of the CeCILL-B license and that you accept its terms.
+REM ------------------------------------------------------------------------  
+
+@echo off
+echo ----------------------------
+echo --creaVtkVariables.bat--
+echo ----------------------------
+
+echo creatoolsGeneration = %1
+echo creavtksourcefolder = %2
+echo docgeneration = %3
+echo buildType = %4
+
+set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin
+cd %binfolder%
+
+
+cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\bbtk CMakeCache.txt
+cmake  -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+cmake CMakeCache.txt
+
+exit /B
\ No newline at end of file

diff --git a/Install_ThirdParty/install-All.bat b/Install_ThirdParty/install-All.bat
new file mode 100644 (file)
index 0000000..f00bd4d
--- /dev/null
+++ b/Install_ThirdParty/install-All.bat
@@ -0,0 +1,7 @@
+start /wait install_generate_thirdparty-x64Release.bat
+start /wait install_generate_thirdparty-x64Debug.bat
+start /wait install_generate_thirdparty-x86Release.bat
+start /wait install_generate_thirdparty-x86Debug.bat
+
+
+pause
\ No newline at end of file

diff --git a/Install_ThirdParty/install_generate_thirdparty-x64Debug.bat b/Install_ThirdParty/install_generate_thirdparty-x64Debug.bat
new file mode 100644 (file)
index 0000000..4747f82
--- /dev/null
+++ b/Install_ThirdParty/install_generate_thirdparty-x64Debug.bat
@@ -0,0 +1,21 @@
+
+
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
+
+set thirdpartyGeneration=e:\creatis\creaThirdPartyComplation\All-x64-D
+set buildType=debug
+
+::Set the following line ON if you want to force x86 compilation
+set forcex86=OFF
+
+call scripts/tpl_variables.bat
+
+call scripts/makeAll.bat
+
+pause
+
+exit

diff --git a/Install_ThirdParty/install_generate_thirdparty-x64Release.bat b/Install_ThirdParty/install_generate_thirdparty-x64Release.bat
new file mode 100644 (file)
index 0000000..575250c
--- /dev/null
+++ b/Install_ThirdParty/install_generate_thirdparty-x64Release.bat
@@ -0,0 +1,21 @@
+
+
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
+
+set thirdpartyGeneration=E:\creatis\creaThirdPartyComplation\All-x64-R
+set buildType=release
+
+::Set the following line ON if you want to force x86 compilation
+set forcex86=OFF
+
+call scripts/tpl_variables.bat
+
+call scripts/makeAll.bat
+
+pause
+
+exit
\ No newline at end of file

diff --git a/Install_ThirdParty/install_generate_thirdparty-x86Debug.bat b/Install_ThirdParty/install_generate_thirdparty-x86Debug.bat
new file mode 100644 (file)
index 0000000..186a224
--- /dev/null
+++ b/Install_ThirdParty/install_generate_thirdparty-x86Debug.bat
@@ -0,0 +1,20 @@
+
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
+
+set thirdpartyGeneration=E:\creatis\creaThirdPartyComplation\All-x86-D
+set buildType=debug
+
+::Set the following line ON if you want to force x86 compilation
+set forcex86=ON
+
+call scripts/tpl_variables.bat
+
+call scripts/makeAll.bat
+
+pause
+
+exit

diff --git a/Install_ThirdParty/install_generate_thirdparty-x86Release.bat b/Install_ThirdParty/install_generate_thirdparty-x86Release.bat
new file mode 100644 (file)
index 0000000..3dc6b96
--- /dev/null
+++ b/Install_ThirdParty/install_generate_thirdparty-x86Release.bat
@@ -0,0 +1,23 @@
+
+@echo off
+
+echo -----------------------------------
+echo ---Setting Environment Variables---
+echo -----------------------------------
+
+set thirdpartyGeneration=e:\creatis\creaThirdPartyComplation\All-x86-R
+set buildType=release
+
+::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12
+::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3
+set wxStable=ON
+::Set the following line ON if you want to force x86 compilation
+set forcex86=ON
+
+call scripts/tpl_variables.bat
+
+call scripts/makeAll.bat
+
+pause
+
+exit