Bug #1908

creatools not compiling boost version TPL installeurs

diff --git a/Install_ThirdParty/Readme.txt b/Install_ThirdParty/Readme.txt
index d29ab44a9975f88a7f84f4a7c153331c435b8f53..fa849c00c198156baae47d78744e4b3b2fc1e90b 100644 (file)
--- a/Install_ThirdParty/Readme.txt
+++ b/Install_ThirdParty/Readme.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 === === ===  UNIX / LINUX users === === ===
 
 DO NOT USE this one!
 === === ===  UNIX / LINUX users === === ===
 
 DO NOT USE this one!

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
index aec2f68f1053f3c214fc885a906db7ef71d787ed..d4b1d6487c2accb1c08500562c33c91e2dbfde7a 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/CMakeLists.txt
@@ -1,30 +1,7 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ###################################
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ###################################

-PROJECT(crea_ThirdParty_Libraries)
+PROJECT(creaTPL)

 ###################################
 
 #==================================
 ###################################
 
 #==================================

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt
index f6632ad5795ea7affdce4862c681fc32d86f256f..97ebe45c173609a2a38aeaff5a39495eff77b76c 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/README.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 creaThirdPartyLibraries
 
 To use this project you must compile each of the following libraries, if possible compile them in release and debug mode
 creaThirdPartyLibraries
 
 To use this project you must compile each of the following libraries, if possible compile them in release and debug mode


@@ -59,4 +36,4 @@ you might need to check the environment variables each library uses so they can
 
 End
 
 
 End
 

-(c) CREATIS 2009
+(c) CREATIS 2009
\ No newline at end of file

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt
index 870fb9d8d439b219301323874291829aeeabff4f..1f5bdfc015085e8632c732f3911113b47ddac4c0 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/CMakeLists.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 # Add a SUBDIRS command for each of your applications
 # SUBDIRS(MyApp1)
 # SUBDIRS(MyApp2)
 # Add a SUBDIRS command for each of your applications
 # SUBDIRS(MyApp1)
 # SUBDIRS(MyApp2)

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt
index 227836949e6f0def4c82b96225d544ed4fc8ea57..abff49ee674856afec899e6de311122bc161976c 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/appli/template_appli/CMakeLists.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR EXECUTABLE
 SET ( EXE_NAME   MyExe  )
 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR EXECUTABLE
 SET ( EXE_NAME   MyExe  )

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
index c769f49124a038b87c13edae965049353579e9b7..30d79b953ff3358b1a40a8e5d3a91b92f1e2d5da 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/install/CMakeLists.txt
@@ -1,25 +1,6 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
+
+
+

 
 
 #-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------


@@ -123,7 +104,7 @@ IF (WIN32)
        
         #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
         #DFCH -- SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")
        
         #DFCH -- SET(MIKTEX_INSTALL_DIR "$INSTDIR\\\\bin\\\\MiKTeX-2.9\\\\miktex\\\\bin")
         #DFCH -- SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";${MIKTEX_INSTALL_DIR}")

-        SET(CREATIS_THIRDPARTYLIBRARIES_DIRS "") #DFCH
+        SET(CREATIS_THIRDPARTYLIBRARIES_DIRS ";") #DFCH

 
        SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "        
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 
 
        SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS  "        
                WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment' 'TTH' '$INSTDIR\\\\bin\\\\tth' 

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt
index e2bd5ddd326269197897d82265e8afb1c9774d24..a9bd25b2e42da96330be409ed1e17e32308a31f6 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/CMakeLists.txt
@@ -1,25 +1,2 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 # Add a SUBDIRS command for each of your libraries
 # SUBDIRS(MyLib1)
 # Add a SUBDIRS command for each of your libraries
 # SUBDIRS(MyLib1)

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt
index 9eeb58e4cd2bf4f2dcca7508db54b6e68c8be924..a41e67d85cd8cdd421e151eadd9b22ddcd6a5104 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_Libraries/lib/template_lib/CMakeLists.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR LIBRARY
 SET ( LIBRARY_NAME   MyLib  )
 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR LIBRARY
 SET ( LIBRARY_NAME   MyLib  )

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
index 9518ed3e8d7eb5a3d55aab03406e19c6ba553ea4..8e3f426e566997df70c7a64a0dc87099420c84dd 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/CMakeLists.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 PROJECT(crea_ThirdParty_dlls)
 
 cmake_minimum_required(VERSION 2.6)
 PROJECT(crea_ThirdParty_dlls)
 
 cmake_minimum_required(VERSION 2.6)

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt
index 28929fdc8256ad9ad24d16fa27a53b80bf83dc00..276a7e7bf62cdc258d50383d9d5b14c2f21af5cf 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/LICENSE.txt
@@ -1,24 +1 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-
-Please refer to each software license.
+Please refer to each software license.
\ No newline at end of file

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt
index 5c325a527c4b12fb8074c2c5bcf7573daf3a6ef6..a818d32f2a8fca2fbeccbb2c300aeec60dc5ab00 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/README.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 To build creaThird party dlls 2 mechanisms are proposed
 
 The first one involves the installation directories where you compiled the libraries
 To build creaThird party dlls 2 mechanisms are proposed
 
 The first one involves the installation directories where you compiled the libraries


@@ -39,4 +16,4 @@ Add the tth directory as this was added in previous releases.
 End
 
 
 End
 
 

-(c) CREATIS 2009
+(c) CREATIS 2009
\ No newline at end of file

diff --git a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
index a82b6dee4410d4b335587b57bc2466455033b0a0..bcf229eecf329c6b6b5ef48f4bb8729fa171403e 100644 (file)
--- a/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
+++ b/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt
@@ -1,26 +1,3 @@
-# ---------------------------------------------------------------------
-#
-# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
-# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
-#
-#  This software is governed by the CeCILL-B license under French law and 
-#  abiding by the rules of distribution of free software. You can  use, 
-#  modify and/ or redistribute the software under the terms of the CeCILL-B 
-#  license as circulated by CEA, CNRS and INRIA at the following URL 
-#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-#  or in the file LICENSE.txt.
-#
-#  As a counterpart to the access to the source code and  rights to copy,
-#  modify and redistribute granted by the license, users are provided only
-#  with a limited warranty  and the software's author,  the holder of the
-#  economic rights,  and the successive licensors  have only  limited
-#  liability. 
-#
-#  The fact that you are presently reading this means that you have had
-#  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------  
-

 
 #-----------------------------------------------------------------------------
 # CPACK+NSIS PACKAGING
 
 #-----------------------------------------------------------------------------
 # CPACK+NSIS PACKAGING

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 34011d335ba9aedbbe41191f6029416a26ed001e..c10e36d0aa48f8e33c3cc05a933f4a9405089fbf 100644 (file)
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -1,26 +1,3 @@
-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 off
 
 echo -----------------------------------

diff --git a/Install_ThirdParty/scripts/cleanAll.bat b/Install_ThirdParty/scripts/cleanAll.bat
index 03dfa68f21ef13f91da0ac2e0622ce021489ccf8..64fab25b275f6fa8ebe8c60888ab42f11c3851bf 100644 (file)
--- a/Install_ThirdParty/scripts/cleanAll.bat
+++ b/Install_ThirdParty/scripts/cleanAll.bat
@@ -1,26 +1,3 @@
-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 thirdpartyGeneration=%1
 @echo off
 
 set thirdpartyGeneration=%1


@@ -34,10 +11,21 @@ echo -----------------------------------
 echo -------Removing Folders------------
 echo -----------------------------------
 
 echo -------Removing Folders------------
 echo -----------------------------------
 

+if %EEDcleanSOURCES%==FALSE GOTO SKIPCLEANSOURCES

 rmdir /S /Q %sourcepath%
 rmdir /S /Q %sourcepath%

+:SKIPCLEANSOURCES
+
+if %EEDcleanBIN%==FALSE GOTO SKIPCLEANBIN

 rmdir /S /Q %binpath%
 rmdir /S /Q %binpath%

+:SKIPCLEANBIN
+
+if %EEDcleanINSTALL%==FALSE GOTO SKIPCLEANINSTALL

 rmdir /S /Q %installpath%
 rmdir /S /Q %installpath%

+:SKIPCLEANINSTALL
+
+if %EEDcleanLOGS%==FALSE GOTO SKIPCLEANLOGS

 rmdir /S /Q %LogFolder%
 rmdir /S /Q %LogFolder%

+:SKIPCLEANLOGS

 
 echo -----------------------------------
 echo -------Creating Folders------------
 
 echo -----------------------------------
 echo -------Creating Folders------------

diff --git a/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index b3dc8729fc344834dc7bd3c58168c42ab9ce2ac8..9604c29da67f1d6fbc153ef6d873c66dda02adf1 100644 (file)
--- a/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -1,26 +1,3 @@
-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 --------Download Libraries---------
 @echo off
 echo -----------------------------------
 echo --------Download Libraries---------


@@ -53,16 +30,19 @@ set wgetPath="%ProgramFilesPath_x86%\GnuWin32\bin\wget.exe"
 if not exist %zipPath% set zipPath="%ProgramFilesPath_x64%\7-Zip\7z.exe"
 if not exist %zipPath% (
   echo ERROR!!! 7Zip has not been found in the system
 if not exist %zipPath% set zipPath="%ProgramFilesPath_x64%\7-Zip\7z.exe"
 if not exist %zipPath% (
   echo ERROR!!! 7Zip has not been found in the system

+  pause

   exit
 )
 if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 if not exist %vcvarsall% (
   echo ERROR!!! Visual Studio has not been found in the system
   exit
 )
 if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 if not exist %vcvarsall% (
   echo ERROR!!! Visual Studio has not been found in the system

+  pause

   exit
 )
 
 if not exist %wgetPath% (
   echo ERROR!!! wget has not been found in the system
   exit
 )
 
 if not exist %wgetPath% (
   echo ERROR!!! wget has not been found in the system

+  pause

   exit
 )
 
   exit
 )
 


@@ -77,11 +57,12 @@ if %wxStable%==ON (
        set WXFNAME=wxWidgets-2.8.12.zip
        set WXVERSION=2.8.12
 ) else (
        set WXFNAME=wxWidgets-2.8.12.zip
        set WXVERSION=2.8.12
 ) else (

-       set WXFNAME=wxWidgets-2.9.3.zip
-       set WXVERSION=2.9.2
+       set WXFNAME=wxWidgets-2.9.4.zip
+       set WXVERSION=2.9.4

 )
 else
 )
 else

-set BOOSTFNAME=boost_1_49_0.7z
+REM set BOOSTFNAME=boost_1_49_0.7z
+set BOOSTFNAME=boost_1_52_0.7z

 set XERCESFNAME=xerces-c-3.1.1.zip
 set ITKFNAME=InsightToolkit-3.20.1.zip
 set VTKFNAME=vtk-5.10.0.zip
 set XERCESFNAME=xerces-c-3.1.1.zip
 set ITKFNAME=InsightToolkit-3.20.1.zip
 set VTKFNAME=vtk-5.10.0.zip


@@ -109,95 +90,103 @@ echo -----------------------------------
 
 cd %sourcepath%\
 
 
 cd %sourcepath%\
 

-%wgetPath% "http://releases.qt-project.org/qt4/source/%QTFNAME%"
-%wgetPath% "http://sourceforge.net/projects/wxwindows/files/%WXVERSION%/%WXFNAME%/download"
-%wgetPath% "http://sourceforge.net/projects/boost/files/boost/1.49.0/%BOOSTFNAME%/download"
-%wgetPath% "http://mirror.ibcp.fr/pub/apache//xerces/c/3/sources/%XERCESFNAME%"
-%wgetPath% "http://sourceforge.net/projects/itk/files/itk/3.20/%ITKFNAME%/download"
-%wgetPath% "http://www.vtk.org/files/release/5.10/%VTKFNAME%"
-%wgetPath% "%urlCreatisSource%/%GDCMFNAME%.gz"
-%wgetPath% "http://hutchinson.belmont.ma.us/tth/tth-noncom/%TTHFNAME%"
-%wgetPath% "ftp://ftp.qt.nokia.com/jom/%JOMFNAME%"
-
-echo -----------------------------------
-echo --------------Qt-------------------
-echo -----------------------------------
-call %vcvarsall%
-
-cd %sourcepath%
-%zipPath% x %sourcepath%\%QTFNAME%
-del %sourcepath%\%QTFNAME%
-
-echo -----------------------------------
-echo --------------JOM------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %sourcepath%\%JOMFNAME% -o*
-del %sourcepath%\%JOMFNAME%
-
-echo -----------------------------------
-echo -----------wxWidgets---------------
-echo -----------------------------------
-echo ----------Extracting---------------
-
-cd %sourcepath%
-%zipPath% x %sourcepath%\%WXFNAME%
+REM%wgetPath% "http://sourceforge.net/projects/itk/files/itk/3.20/%ITKFNAME%/download"
+REM%wgetPath% "http://sourceforge.net/projects/wxwindows/files/%WXVERSION%/%WXFNAME%/download"
+REM%wgetPath% "http://sourceforge.net/projects/boost/files/boost/1.49.0/%BOOSTFNAME%/download"
+
+if %EEDdownloadQT%==FALSE GOTO SKIPDOWNLOADQT
+  %wgetPath% "http://releases.qt-project.org/qt4/source/%QTFNAME%"
+  %wgetPath% "http://releases.qt-project.org/jom/%JOMFNAME%"
+  echo -----------------------------------
+  echo --------------Qt-------------------
+  echo -----------------------------------
+  call %vcvarsall%
+  cd %sourcepath%
+  %zipPath% x %sourcepath%\%QTFNAME%
+  del %sourcepath%\%QTFNAME%
+  echo -----------------------------------
+  echo --------------JOM------------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %sourcepath%\%JOMFNAME% -o*
+  del %sourcepath%\%JOMFNAME%
+:SKIPDOWNLOADQT
+  
+if %EEDdownloadITK%==FALSE GOTO SKIPDOWNLOADITK
+  %wgetPath% "http://downloads.sourceforge.net/project/itk/itk/3.20/%ITKFNAME%?r=http%3A%2F%2Fwww.itk.org%2FITK%2Fresources%2Fsoftware.html&ts=1357254419&use_mirror=ufpr"
+  echo -----------------------------------
+  echo -------------ITK-------------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %ITKFNAME%
+  del %ITKFNAME%
+:SKIPDOWNLOADITK
+  
+if %EEDdownloadWXWINDOWS%==FALSE GOTO SKIPDOWNLOADWXWINDOWS
+  %wgetPath% "http://downloads.sourceforge.net/project/wxwindows/%WXVERSION%/%WXFNAME%?r=http%3A%2F%2Fwww.wxwidgets.org%2Fdownloads%2F%23latest_dev&ts=1357255370&use_mirror=ufpr"
+  echo -----------------------------------
+  echo -----------wxWidgets---------------
+  echo -----------------------------------
+  echo ----------Extracting---------------
+  cd %sourcepath%
+  %zipPath% x %sourcepath%\%WXFNAME%

   del %sourcepath%\%WXFNAME%
   del %sourcepath%\%WXFNAME%

+:SKIPDOWNLOADWXWINDOWS
+
+if %EEDdownloadBOOST%==FALSE GOTO SKIPDOWNLOADBOOST
+  REM %wgetPath% "http://downloads.sourceforge.net/project/boost/boost/1.49.0/%BOOSTFNAME%?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fboost%2Ffiles%2Fboost%2F1.49.0%2F&ts=1357255694&use_mirror=hivelocity"
+  %wgetPath% "http://downloads.sourceforge.net/project/boost/boost/1.52.0/boost_1_52_0.7z?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fboost%2Ffiles%2Fboost%2F1.52.0%2Fboost_1_52_0.7z%2Fdownload&ts=1360058777&use_mirror=ignum"
+  echo -----------------------------------
+  echo ------------Boost------------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %sourcepath%\%BOOSTFNAME%
+  del %sourcepath%\%BOOSTFNAME%
+:SKIPDOWNLOADBOOST
+
+if %EEDdownloadXERCES%==FALSE GOTO SKIPDOWNLOADXERCES
+  %wgetPath% "http://mirror.ibcp.fr/pub/apache//xerces/c/3/sources/%XERCESFNAME%"
+  echo -----------------------------------
+  echo -------------XERCES----------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %XERCESFNAME%
+  del %XERCESFNAME%
+:SKIPDOWNLOADXERCES
+
+if %EEDdownloadVTK%==FALSE GOTO SKIPDOWNLOADVTK
+  %wgetPath% "http://www.vtk.org/files/release/5.10/%VTKFNAME%"
+  echo -----------------------------------
+  echo -------------VTK-------------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %sourcepath%\%VTKFNAME%
+  del %sourcepath%\%VTKFNAME%
+:SKIPDOWNLOADVTK
+  
+if %EEDdownloadGDCM%==FALSE GOTO SKIPDOWNLOADGDCM
+  %wgetPath% "%urlCreatisSource%/%GDCMFNAME%.gz"
+  echo -----------------------------------
+  echo ------------GDCM ------------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %GDCMFNAME%.gz
+  %zipPath% x %GDCMFNAME%
+  del %GDCMFNAME%.gz
+  del %GDCMFNAME%
+:SKIPDOWNLOADGDCM
+  
+if %EEDdownloadTTH%==FALSE GOTO SKIPDOWNLOADTTH
+  %wgetPath% "http://hutchinson.belmont.ma.us/tth/tth-noncom/%TTHFNAME%"
+  echo -----------------------------------
+  echo --------------TTH------------------
+  echo -----------------------------------
+  cd %sourcepath%
+  %zipPath% x %TTHFNAME%
+  del %TTHFNAME%
+:SKIPDOWNLOADTTH

 
 

-echo -----------------------------------
-echo ------------Boost------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %sourcepath%\%BOOSTFNAME%
-del %sourcepath%\%BOOSTFNAME%
-
-echo -----------------------------------
-echo -------------VTK-------------------
-echo -----------------------------------

 
 

-cd %sourcepath%
-%zipPath% x %sourcepath%\%VTKFNAME%
-del %sourcepath%\%VTKFNAME%
-
-echo -----------------------------------
-echo ------------GDCM ------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %GDCMFNAME%.gz
-%zipPath% x %GDCMFNAME%
-del %GDCMFNAME%.gz
-del %GDCMFNAME%
-
-echo -----------------------------------
-echo -------------ITK-------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %ITKFNAME%
-del %ITKFNAME%
-
-echo -----------------------------------
-echo -------------XERCES----------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %XERCESFNAME%
-del %XERCESFNAME%
-
-echo -----------------------------------
-echo --------------TTH------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %TTHFNAME%
-del %TTHFNAME%
-
-echo ------End TTH Installation---------
-
-echo -----------------------------------

 
 echo -----------------------------------
 echo --------Renaming Folders-----------
 
 echo -----------------------------------
 echo --------Renaming Folders-----------


@@ -205,7 +194,8 @@ echo -----------------------------------
 cd %sourcepath%
 rename qt-everywhere-opensource-src-4.8.2 qt
 rename wxWidgets-%WXVERSION% wxWidgets
 cd %sourcepath%
 rename qt-everywhere-opensource-src-4.8.2 qt
 rename wxWidgets-%WXVERSION% wxWidgets

-rename boost_1_49_0 boost
+REM rename boost_1_49_0 boost
+rename boost_1_52_0 boost

 rename InsightToolkit-3.20.1 itk
 rename VTK vtk
 rename gdcm gdcm13
 rename InsightToolkit-3.20.1 itk
 rename VTK vtk
 rename gdcm gdcm13

diff --git a/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat b/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
index c4533b923b53358e3018ff58814a5b4b1d758e29..4294739be587ad2a01390d02b287f5690dbdd78d 100644 (file)
--- a/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
+++ b/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
@@ -1,26 +1,3 @@
-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 thirdpartyGeneration=%1
 @echo off
 
 set thirdpartyGeneration=%1

diff --git a/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat b/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
index 4d6d54fc5aa50427556a3c42ab7534aafbfb6177..92ef1cf4494cce978813a201b9a33cdbebe3e815 100644 (file)
--- a/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
+++ b/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
@@ -1,26 +1,3 @@
-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 thirdpartyGeneration=%1
 @echo off
 
 set thirdpartyGeneration=%1

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index e574efd837b68d2674f166a7142523977f959ded..e37a3e354c962e5a9738676a69ad271fde5195bf 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -1,26 +1,3 @@
-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 ------Installing Libraries---------
 @echo off
 echo -----------------------------------
 echo ------Installing Libraries---------


@@ -105,9 +82,11 @@ echo -----------------------------------
 
 
 if %x86Comp%==ON (
 
 
 if %x86Comp%==ON (

+       set addressmodel=32

        call %vcvarsall%
        echo "Compilation forced x86"
 ) else (
        call %vcvarsall%
        echo "Compilation forced x86"
 ) else (

+       set addressmodel=64

        if %PROCESSOR_ARCHITECTURE%==x86 (
                call %vcvarsall%
        ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
                call %vcvarsall%
        ) else (


@@ -115,18 +94,19 @@ if %x86Comp%==ON (
        )
 )
 
        )
 )
 

+if %EEDinstallQT%==FALSE GOTO SKIPINSTALLQT

 echo -----------------------------------
 echo --------Qt Installation------------
 echo -----------------------------------
 cd %QTDIR%
 set QMAKESPEC=win32-msvc2010
 echo -----------------------------------
 echo --------Qt Installation------------
 echo -----------------------------------
 cd %QTDIR%
 set QMAKESPEC=win32-msvc2010

-

 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp >> %LogFolder%\qtInstall.log 2>&1
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp >> %LogFolder%\qtInstall.log 2>&1

-

 %JOMDIR%\jom.exe -j %NUMBER_OF_PROCESSORS% >> %LogFolder%\qtInstall.log 2>&1
 %JOMDIR%\jom.exe -j %NUMBER_OF_PROCESSORS% >> %LogFolder%\qtInstall.log 2>&1

-

 cd C:\
 cd C:\

+:SKIPINSTALLQT
+

 
 

+if %EEDinstallWXWIDGETS%==FALSE GOTO SKIPINSTALLWXWIDGETS

 echo -----------------------------------
 echo -----wxWidgets Installation--------
 echo -----------------------------------
 echo -----------------------------------
 echo -----wxWidgets Installation--------
 echo -----------------------------------


@@ -141,37 +121,51 @@ if %x86Comp%==ON (
        )
 )
 cd C:\
        )
 )
 cd C:\

+:SKIPINSTALLWXWIDGETS

 
 

+
+if %EEDinstallBOOST%==FALSE GOTO SKIPINSTALLBOOST

 echo -----------------------------------
 echo ------Boost Installation-----------
 echo -----------------------------------
 echo -----------------------------------
 echo ------Boost Installation-----------
 echo -----------------------------------

-

 mkdir %binpath%\%boost%Bin 
 mkdir %installpath%\%boost%
 mkdir %binpath%\%boost%Bin 
 mkdir %installpath%\%boost%

-

 cd %sourcepath%\%boost%
 cd %sourcepath%\%boost%

-

 call bootstrap.bat >> %LogFolder%\boostInstall.log 2>&1
 
 call bootstrap.bat >> %LogFolder%\boostInstall.log 2>&1
 

-if %x86Comp%==ON (
-       bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
-) else (
-       if %PROCESSOR_ARCHITECTURE%==x86 (
-               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
-       ) else (
-               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 architecture=x86 address-model=64 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
-       )
-)
+bjam.exe -j %NUMBER_OF_PROCESSORS% --address-model=%addressmodel% --prefix=%installpath%\%boost% --build-dir=%binpath%\%boost%Bin toolset=msvc-10.0 variant=%buildType% link=shared runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
+bjam.exe -j %NUMBER_OF_PROCESSORS% --address-model=%addressmodel% --prefix=%installpath%\%boost% --build-dir=%binpath%\%boost%Bin toolset=msvc-10.0 variant=%buildType% link=shared runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
+
+
+::if %x86Comp%==ON (
+::     echo -install_thirdparty_all-EED1a 
+::     bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
+::     echo -install_thirdparty_all-EED1b
+::) else (
+::     if %PROCESSOR_ARCHITECTURE%==x86 (
+::             echo -install_thirdparty_all-EED2a
+::             bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
+::             echo -install_thirdparty_all-EED2b
+::     ) else (
+::             echo -install_thirdparty_all-EED3a
+::             bjam.exe -j %NUMBER_OF_PROCESSORS% --address-model=64 --prefix=%installpath%\%boost% --build-dir=%binpath%\%boost%Bin toolset=msvc-10.0 variant=%buildType% link=shared runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
+::             echo -install_thirdparty_all-EED3b
+::             bjam.exe -j %NUMBER_OF_PROCESSORS% --address-model=64 --prefix=%installpath%\%boost% --build-dir=%binpath%\%boost%Bin toolset=msvc-10.0 variant=%buildType% link=shared runtime-link=shared install >> %LogFolder%\boostInstall.log 2>&1
+::             echo -install_thirdparty_all-EED3c
+::     )
+::)
+

 cd C:\
 cd C:\

+:SKIPINSTALLBOOST
+

 
 

+if %EEEDinstallVTK%==FALSE GOTO SKIPINSTALLVTK

 echo -----------------------------------
 echo -------VTK Installation------------
 echo -----------------------------------
 echo -----------------------------------
 echo -------VTK Installation------------
 echo -----------------------------------

-

 cd  %binpath%
 mkdir %vtk%Bin
 cd %vtk%Bin
 cd  %binpath%
 mkdir %vtk%Bin
 cd %vtk%Bin

-

 if %x86Comp%==ON (
        cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
 ) else (
 if %x86Comp%==ON (
        cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
 ) else (


@@ -181,25 +175,22 @@ if %x86Comp%==ON (
                cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
        )
 )
                cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin >> %LogFolder%\vtkInstall.log 2>&1
        )
 )

-

 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
 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 >> %LogFolder%\vtkInstall.log 2>&1
 cmake CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\vtkInstall.log 2>&1
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj >> %LogFolder%\vtkInstall.log 2>&1
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
 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 >> %LogFolder%\vtkInstall.log 2>&1
 cmake CMakeCache.txt >> %LogFolder%\vtkInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\vtkInstall.log 2>&1
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj >> %LogFolder%\vtkInstall.log 2>&1

-

 cd c:\
 cd c:\

+:SKIPINSTALLVTK

 
 
 
 

+if %EEDinstallGDCM%==FALSE GOTO SKIPINSTALLGDCM

 echo -----------------------------------
 echo -------GDCM Installation-----------
 echo -----------------------------------
 echo -----------------------------------
 echo -------GDCM Installation-----------
 echo -----------------------------------

-

 cd  %binpath%
 mkdir %gdcm%Bin
 cd  %binpath%
 mkdir %gdcm%Bin

-

 cd %gdcm%Bin
 cd %gdcm%Bin

-

 if %x86Comp%==ON (
        cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
 ) else (
 if %x86Comp%==ON (
        cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
 ) else (


@@ -209,23 +200,22 @@ if %x86Comp%==ON (
                cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
        )
 )
                cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin >> %LogFolder%\GDCMInstall.log 2>&1
        )
 )

-

 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
 cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
 cmake CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1
 msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
 cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
 cmake CMakeCache.txt >> %LogFolder%\GDCMInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1
 msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\GDCMInstall.log 2>&1

-

 cd c:\
 cd c:\

+:SKIPINSTALLGDCM

 
 

+
+if %EEDinstallITK%==FALSE GOTO SKIPINSTALLITK

 echo -----------------------------------
 echo -------ITK Installation------------
 echo -----------------------------------
 echo -----------------------------------
 echo -------ITK Installation------------
 echo -----------------------------------

-

 cd  %binpath%
 mkdir %itk%Bin
 cd %itk%Bin
 cd  %binpath%
 mkdir %itk%Bin
 cd %itk%Bin

-

 if %x86Comp%==ON (
        cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin >> %LogFolder%\ITKInstall.log 2>&1
 ) else (
 if %x86Comp%==ON (
        cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin >> %LogFolder%\ITKInstall.log 2>&1
 ) else (


@@ -240,9 +230,12 @@ cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:
 cmake CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\ITKInstall.log 2>&1
 msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\ITKInstall.log 2>&1
 cmake CMakeCache.txt >> %LogFolder%\ITKInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\ITKInstall.log 2>&1
 msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\ITKInstall.log 2>&1

-

 cd c:\
 cd c:\

+:SKIPINSTALLITK

 
 

+
+
+if %EEDinstallXERCES%==FALSE GOTO SKIPINSTALLXERCES

 echo -----------------------------------
 echo ------XERCES Installation----------
 echo -----------------------------------
 echo -----------------------------------
 echo ------XERCES Installation----------
 echo -----------------------------------


@@ -250,6 +243,9 @@ cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
 msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1
 msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% >> %LogFolder%\XERCESInstall.log 2>&1

+cd c:\
+:SKIPINSTALLXERCES
+

 
 echo -----------------------------------
 echo ---End of Installing Libraries-----
 
 echo -----------------------------------
 echo ---End of Installing Libraries-----

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index f1fe1b84e185c39244bf6fa25529574a0d43d633..86c14514daf84c0cf1f5b8226a78ec843dfcc44c 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -1,26 +1,3 @@
-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 -----Generating Installers of------
 @echo off
 echo -----------------------------------
 echo -----Generating Installers of------

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index 7e6a048f190ca9cf56d50e9ff3cf16fbfee5dabe..63436005600c5a686f4feb8823fe587447d1875f 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -1,26 +1,3 @@
-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 -----Generating Installers of------
 @echo off
 echo -----------------------------------
 echo -----Generating Installers of------

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index ffaafb22be54eb6f3068dd810f168f23ee5276b4..0b3c0f34dc7f7ff9521a77f16550a6db5673e19f 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -1,26 +1,3 @@
-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 ----------Moving Dlls--------------
 @echo off
 echo -----------------------------------
 echo ----------Moving Dlls--------------


@@ -67,7 +44,7 @@ rmdir /S /Q %creaThirdPartydlls%
 mkdir %creaThirdPartydlls%
 
 echo setting buildtype libraries
 mkdir %creaThirdPartydlls%
 
 echo setting buildtype libraries

-echo if(%buildType%=="release")(
+if %buildType%==release (

        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28
        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28


@@ -96,12 +73,14 @@ if %x86Comp%==ON (
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------

+echo buildType=%buildType%

 echo ThirdpartyGeneration=%thirdpartyGeneration%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
 echo creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries
 echo QT=%qt%
 echo ThirdpartyGeneration=%thirdpartyGeneration%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
 echo creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries
 echo QT=%qt%

+echo qtBtype=%qtBtype%

 echo WX=%wxWidgets%
 echo BOOST=%boost%
 echo Xercesc=%xercesc%
 echo WX=%wxWidgets%
 echo BOOST=%boost%
 echo Xercesc=%xercesc%


@@ -156,8 +135,10 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
 echo -------------Boost-----------------
 echo -----------------------------------
 

-set boostMT=-vc100-mt-1_49.dll
-set boostMTGD=-vc100-mt-gd-1_49.dll
+REM set boostMT=-vc100-mt-1_49.dll
+REM set boostMTGD=-vc100-mt-gd-1_49.dll
+set boostMT=-vc100-mt-1_52.dll
+set boostMTGD=-vc100-mt-gd-1_52.dll

 
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMT% %creaThirdPartydlls%
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMTGD% %creaThirdPartydlls%
 
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMT% %creaThirdPartydlls%
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMTGD% %creaThirdPartydlls%

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 8197ade16bd2f1fc381c8e37d22c3d8642b67eeb..279425176102b76291f712e56325a61ae1da96fc 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -1,26 +1,3 @@
-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 --------Moving Libraries-----------
 @echo off
 echo -----------------------------------
 echo --------Moving Libraries-----------


@@ -75,16 +52,16 @@ set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
 
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
 

-echo if(%buildType%==release)(
+if %buildType%==release (

        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28
        set qtBtype=4
        set wxPrefixBase=wxbase28
        set wxPrefixmsw=wxmsw28

-       set xercesFile=xerces-c_3_1.dll
+       set xercesFile=xerces-c_3_1.lib

  ) else (
        set qtBtype=d4
        set wxPrefixBase=wxbase28d
        set wxPrefixmsw=wxmsw28d
  ) else (
        set qtBtype=d4
        set wxPrefixBase=wxbase28d
        set wxPrefixmsw=wxmsw28d

-       set xercesFile=xerces-c_3_1D.dll
+       set xercesFile=xerces-c_3D.lib

  )
 
 if %x86Comp%==ON (
  )
 
 if %x86Comp%==ON (


@@ -300,10 +277,15 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
 echo -------------Boost-----------------
 echo -----------------------------------
 

-set boostMT=-vc100-mt-1_49.lib
-set boostMTGD=-vc100-mt-gd-1_49.lib
-set boostMTS=-vc100-mt-s-1_49.lib
-set boostMTSGD=-vc100-mt-sgd-1_49.lib
+REM set boostMT=-vc100-mt-1_49.lib
+REM set boostMTGD=-vc100-mt-gd-1_49.lib
+REM set boostMTS=-vc100-mt-s-1_49.lib
+REM set boostMTSGD=-vc100-mt-sgd-1_49.lib
+
+set boostMT=-vc100-mt-1_52.lib
+set boostMTGD=-vc100-mt-gd-1_52.lib
+set boostMTS=-vc100-mt-s-1_52.lib
+set boostMTSGD=-vc100-mt-sgd-1_52.lib

 
 mkdir %creaThirdPartyLibraries%\%boost%
 
 
 mkdir %creaThirdPartyLibraries%\%boost%