#3200 creaToolsTools Feature New Normal branch mingw64

diff --git a/Install_mingw64/Install_CreaTools/scripts/All2.bat b/Install_mingw64/Install_CreaTools/scripts/All2.bat
index a8ab429b6a8b932267757a4aa290761e15160ba8..e494b52dfc9f0e081e01a98c68a48b9daeff45cf 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/All2.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/All2.bat
@@ -49,26 +49,26 @@ call %scriptsFolder%\base\configureVariables.bat
 REM goto skypToEED
 REM :skypToEED
 
-::echo call compile crea
-::start /B /wait %scriptsFolder%\creaInstall.bat
-::echo call compile bbtk
-::start /B /wait %scriptsFolder%\bbtkInstall.bat
-::echo call compile creaMaracasVisu
-::start /B /wait %scriptsFolder%\creaMaracasVisuInstall.bat
-::echo call compile creaVtk
-::start /B /wait %scriptsFolder%\creaVtkInstall.bat
-::echo call compile creaEnvironment
-::start /B /wait %scriptsFolder%\creaEnvironmentInstall.bat
-::echo call compile creaBruker
-::start /B /wait %scriptsFolder%\creaBrukerInstall.bat
-::echo call compile creaImageIO
-::start /B /wait %scriptsFolder%\creaImageIOInstall.bat
-::echo call compile creaContours
-::start /B /wait %scriptsFolder%\creaContoursInstall.bat
-::echo call compile creaRigidRegistration
-::start /B /wait %scriptsFolder%\creaRigidRInstall.bat
-::echo call compile bbtkGEditor
-::start /B /wait %scriptsFolder%\bbtkGEditorInstall.bat
+echo call compile crea
+start /B /wait %scriptsFolder%\creaInstall.bat
+echo call compile bbtk
+start /B /wait %scriptsFolder%\bbtkInstall.bat
+echo call compile creaMaracasVisu
+start /B /wait %scriptsFolder%\creaMaracasVisuInstall.bat
+echo call compile creaVtk
+start /B /wait %scriptsFolder%\creaVtkInstall.bat
+echo call compile creaEnvironment
+start /B /wait %scriptsFolder%\creaEnvironmentInstall.bat
+echo call compile creaBruker
+start /B /wait %scriptsFolder%\creaBrukerInstall.bat
+echo call compile creaImageIO
+start /B /wait %scriptsFolder%\creaImageIOInstall.bat
+echo call compile creaContours
+start /B /wait %scriptsFolder%\creaContoursInstall.bat
+echo call compile creaRigidRegistration
+start /B /wait %scriptsFolder%\creaRigidRInstall.bat
+echo call compile bbtkGEditor
+start /B /wait %scriptsFolder%\bbtkGEditorInstall.bat
 echo call compile creaMinitools
 start /B /wait %scriptsFolder%\creaMinitoolsInstall.bat
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat
index 2af51f0a2f10a11f838c50238c381924bdb6d402..562eb2da3853cfb945a2a44fbc63a1eec8e2f1b5 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/cmakemod.bat
@@ -62,10 +62,15 @@ echo Architecture found = %PROCESSOR_ARCHITECTURE%
 set binfolder=%3\creatools_%buildtype%%platforme%\cb\%1Bin
 cd %binfolder%
 
-echo cmake -G"%compilerVersion%" -H%3\creatools_sources\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin
-echo cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt
+::echo cmake -G"%compilerVersion%" -H%3\cs\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin
+::echo cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt
+::%cmakeBin% -G"MinGW Makefiles" -H%3\cs\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin 
+::%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt 
 
+echo cmake -G"%compilerVersion%" -H%3\cs\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin
+echo cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt
 %cmakeBin% -G"MinGW Makefiles" -H%3\cs\%1 -B%3\c_%buildtype%%platforme%\cb\%1Bin 
-%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt 
+%cmakeBin% -D CMAKE_BUILD_TYPE:STRING=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%2 CMakeCache.txt 
+
 
 exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
index cf49c8ce5be7e704913eadc53f6b99d687a40017..a231bfabc6ec5ea59ce04159360aa5635a59c040 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/base/compilemod.bat
@@ -58,7 +58,7 @@ echo Architecture found = %PROCESSOR_ARCHITECTURE%
 ::     )
 ::)
 
-set binfolder=%3\creatools_%buildtype%%platforme%\cb\%2Bin
+set binfolder=%3\c_%buildtype%%platforme%\cb\%2Bin
 cd %binfolder%
 REM FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1
 REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj
@@ -69,7 +69,7 @@ REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Config
 mingw32-make.exe -j%NUMBER_OF_PROCESSORS% 
 mingw32-make.exe install
 
-copy %2*.exe %3\c_%buildtype%%platforme%\ri\
+::copy %2*.exe %3\c_%buildtype%%platforme%\ri\
 
 
 exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_CreaTools/scripts/bbtkGEditorVariables.bat b/Install_mingw64/Install_CreaTools/scripts/bbtkGEditorVariables.bat
index 4aa28c9977547cea0ec659d67b7887e992770fa9..09894cb56885ef2cf0edb9c92d990d17907d4ddc 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/bbtkGEditorVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/bbtkGEditorVariables.bat
@@ -44,10 +44,15 @@ IF %4==Debug (
 ::cmake -D BUILD_bbtkGEditor_DOC:BOOL=%3 CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
-%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
-%cmakeBin% -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaMaracasVisu CMakeCache.txt
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaMaracasVisu CMakeCache.txt
+::%cmakeBin% -D BUILD_bbtkGEditor_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_bbtkGEditor_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
-
 exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
index fab38725d6a47ee092ac369de0fc646d286c433b..17b394f3933eb61d45f89c3d7ae19e4f4e7a7032 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/bbtkVariables.bat
@@ -31,7 +31,7 @@ echo bbtksourcefolder = %2
 echo docgeneration = %3
 echo buildType = %4
 
-set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin
+set binfolder=%1\c_%buildtype%%platforme%\cb\%2Bin
 cd %binfolder%
 
 IF %4==Debug (
@@ -45,10 +45,14 @@ IF %4==Debug (
 ::cmake CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_DOC:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=%3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=%3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=%3 CMakeCache.txt
+::%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+
+%cmakeBin% -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_DOC:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=%3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=%3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=%3 CMakeCache.txt
 %cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
-
 exit /B

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaBrukerVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaBrukerVariables.bat
index eddbdebb939e727dc6e778ccf2c6a49383af93ed..b3bc850d352fb4f06fefcf8f49ee8ebaccb13773 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaBrukerVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaBrukerVariables.bat
@@ -39,6 +39,9 @@ IF %4==Debug (
 )
 
 ::cmake -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea  -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt
-%cmakeBin% -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea  -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt
+
+::%cmakeBin% -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea  -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt
+
+%cmakeBin% -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci  -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt
 
 exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
index 87e4df58fd66d1f9f4fdad1a9507d3aba11b7d82..7e2febb2a7f06e790ecf2c964ce2b5ff22e186f5 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaContoursVariables.bat
@@ -45,8 +45,13 @@ echo %1=creabrukersource% %2=docgeneration
 ::cmake -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea -D creaEnvironment_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaEnvironment -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaMaracasVisu -D creaImageIO_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaImageIO CMakeCache.txt
-%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea -D creaEnvironment_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaEnvironment -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaMaracasVisu -D creaImageIO_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaImageIO CMakeCache.txt
+::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaEnvironment_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaMaracasVisu_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D creaImageIO_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat
index 8bddc51f17793f11f007123909ad13aaec66502c..61dab8c7310dc9e7bc37bfe5c1873ac212f81611 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaImageIOVariables.bat
@@ -43,8 +43,13 @@ IF %4==Debug (
 ::cmake -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
+::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\c_%buildtype%%platforme%\ci\creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
+::%cmakeBin% -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
+
+%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\c_%buildtype%%platforme%\ci -D USE_GDCM:BOOL=ON CMakeCache.txt
 %cmakeBin% -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% -D CMAKE_CXX_FLAGS:STRING="-fpermissive" CMakeCache.txt
 

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat
index da0f4cd463ca26fc4c763141c9110f3458779900..44f47a495504a9f42bcdf48c5a9e6ccb4c591e72 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaMaracasVariables.bat
@@ -47,13 +47,19 @@ IF %4==Debug (
 ::cmake CMakeCache.txt
 
 
+::%cmakeBin% -D CMAKE_CXX_FLAGS:STRING=/openmp
+::%cmakeBin%  -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin%  -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin%  CMakeCache.txt
+
 %cmakeBin% -D CMAKE_CXX_FLAGS:STRING=/openmp
-%cmakeBin%  -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
-%cmakeBin%  -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+%cmakeBin%  -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin%  -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin%  -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin%  CMakeCache.txt
 
 
-
 exit /B

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaMiniToolsVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaMiniToolsVariables.bat
index d81a2dd7d5d49e0c449629a1e21c3c67320689cf..0c035a1c57565c701f8c0db3db8818b19db74eab 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaMiniToolsVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaMiniToolsVariables.bat
@@ -49,8 +49,18 @@ IF %4==Debug (
 ::cmake -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_BBS_APP:BOOL=ON CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
-%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniTools:BOOL=ON -D creaMiniTools_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniTools_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniToolsBase:BOOL=ON -D creaMiniToolsBase_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+::::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniTools_BBS_APP:BOOL=ON CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_BBS_APP:BOOL=ON CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniTools:BOOL=ON -D creaMiniTools_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniTools_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaMiniToolsBase:BOOL=ON -D creaMiniToolsBase_DOC:BOOL=%3 CMakeCache.txt

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaRigidRegistrationVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaRigidRegistrationVariables.bat
index cf721c047c80ee043774aeaed4635e5c51ada145..d853f533379d3d2d979384d2433c2021550b012f 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaRigidRegistrationVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaRigidRegistrationVariables.bat
@@ -45,12 +45,20 @@ IF %4==Debug (
 ::cmake CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
-%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt
+::%cmakeBin% -D BUILD_creaRigidRegistration_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt
 %cmakeBin% -D BUILD_creaRigidRegistration_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
 
+
 exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat
index ace0ff006503e0b6b6bc44d2763d43aab50e0e9c..3ca1d7e6755cc6e4d6e4a08106810f6bc011579b 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaVariables.bat
@@ -31,7 +31,7 @@ echo creasource = %2
 echo docgeneration = %3
 echo buildType = %4
 
-set binfolder=%1\creatools_%buildtype%%platforme%\cb\%2Bin
+set binfolder=%1\c_%buildtype%%platforme%\cb\%2Bin
 cd %binfolder%
 
 IF %4==Debug (

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat
index 3497c69803695b4a4e225748e96082cb99c2a432..b650848db009f7ad5adc926200c87d72abed0fdb 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaVtkVariables.bat
@@ -41,11 +41,18 @@ cd %binfolder%
 ::cmake -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 ::cmake CMakeCache.txt
 
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
-%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+::%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci\bbtk CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
+::%cmakeBin% CMakeCache.txt
+
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
+%cmakeBin% -D BBTK_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk:BOOL=ON -D creaVtk_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% -D BUILD_BBTK_PACKAGE_creaVtk_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 %cmakeBin% CMakeCache.txt
 
 
+
 exit /B
\ No newline at end of file

diff --git a/Install_mingw64/Install_CreaTools/scripts/creaenvironmentVariables.bat b/Install_mingw64/Install_CreaTools/scripts/creaenvironmentVariables.bat
index 01468fbe39628a15508783a608e63b4c5d655229..fa8633bda9cef6fab34a2d3d25f964789bd6b988 100644 (file)
--- a/Install_mingw64/Install_CreaTools/scripts/creaenvironmentVariables.bat
+++ b/Install_mingw64/Install_CreaTools/scripts/creaenvironmentVariables.bat
@@ -39,6 +39,9 @@ IF %4==Debug (
 )
 
 ::cmake -D crea_DIR:PATH=%1\creatools_%buildtype%%platforme%\creatools_install\crea CMakeCache.txt
-%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+
+::%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci\crea CMakeCache.txt
+
+%cmakeBin% -D crea_DIR:PATH=%1\c_%buildtype%%platforme%\ci CMakeCache.txt
 
 exit /B
\ No newline at end of file