From: Eduardo DAVILA Date: Wed, 8 Aug 2018 09:12:16 +0000 (+0200) Subject: #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cf7383240a787668f1cb87f5bac979d9da77a61c;p=creaToolsTools.git #3224 creaToolsTools Feature New Normal - vtk8itk4wx3-mingw64 --- diff --git a/Install_mingw64/Install_CreaTools/creatools.bat b/Install_mingw64/Install_CreaTools/creatools.bat index 4f32761..8ae283b 100644 --- a/Install_mingw64/Install_CreaTools/creatools.bat +++ b/Install_mingw64/Install_CreaTools/creatools.bat @@ -1,7 +1,7 @@ @echo off -set baseProject=C:\Users\davila\Creatools +set baseProject=C:\Users\davila\Creatools-7 set ProgramFiles=C:\Program Files ::set baseProject=E:\creatis\c_mingw ::set ProgramFiles=C:\Program Files (x86) diff --git a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat index c1ed5a7..d2fc683 100644 --- a/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat +++ b/Install_mingw64/Install_CreaTools/scripts/base/downloadSources.bat @@ -41,64 +41,64 @@ echo cd %creatoolsGeneration2%/cs >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creasource% >> tmp.sh echo cd %creasource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtksource% >> tmp.sh echo cd %bbtksource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creamaracassource% >> tmp.sh echo cd %creamaracassource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creavtksource% >> tmp.sh echo cd %creavtksource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaenvironmentsource% >> tmp.sh echo cd %creaenvironmentsource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creabrukersource% >> tmp.sh echo cd %creabrukersource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaimagesource% >> tmp.sh echo cd %creaimagesource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creacontourssource% >> tmp.sh echo cd %creacontourssource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%crearigidregistrationssource% >> tmp.sh echo cd %crearigidregistrationssource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%bbtkgeditorsource% >> tmp.sh echo cd %bbtkgeditorsource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creaminitoolssource% >> tmp.sh echo cd %creaminitoolssource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh echo git clone ssh://gitolite@git.creatis.insa-lyon.fr/%creatoolssource% >> tmp.sh echo cd %creatoolssource% >> tmp.sh -echo git checkout vtk7itk4wx3-mingw64 >> tmp.sh +echo git checkout vtk8itk4wx3-mingw64 >> tmp.sh echo cd .. >> tmp.sh diff --git a/Install_mingw64/Install_CreaTools/scripts/tmp.sh b/Install_mingw64/Install_CreaTools/scripts/tmp.sh index 0dce247..4a29339 100644 --- a/Install_mingw64/Install_CreaTools/scripts/tmp.sh +++ b/Install_mingw64/Install_CreaTools/scripts/tmp.sh @@ -1,7 +1,7 @@ echo tmp.sh -mkdir C:/Users/davila/Creatools/C5/ct -mkdir C:/Users/davila/Creatools/C5/ct/cs -cd C:/Users/davila/Creatools/C5/ct/cs +mkdir C:/Users/davila/Creatools-7/C5/ct +mkdir C:/Users/davila/Creatools-7/C5/ct/cs +cd C:/Users/davila/Creatools-7/C5/ct/cs git clone ssh://gitolite@git.creatis.insa-lyon.fr/crea cd crea git checkout vtk7itk4wx3-mingw64 diff --git a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt index 885e9c8..b753986 100644 --- a/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt +++ b/Install_mingw64/Install_ThirdParty/cmake/crea_ThirdParty_dlls/install/CMakeLists.txt @@ -21,7 +21,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION}) -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CREATIS\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") IF(WIN32) SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea_dlls_extern) ENDIF(WIN32)