merge from master

[tools/sat_salome.git] / products / compil_scripts / CAS_7.5.bat

diff --git a/products/compil_scripts/CAS_7.5.bat b/products/compil_scripts/CAS_7.5.bat
index 71f059708ddd66f8fc73335ae786ab339c1d2b99..e1499d48c2b15cb1521888b4ff4a406684a04112 100644 (file)
--- a/products/compil_scripts/CAS_7.5.bat
+++ b/products/compil_scripts/CAS_7.5.bat
@@ -39,6 +39,9 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_GL2PS:BOOL=OFF
 REM no TCL/TK
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF
 
+REM bos #26509
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON
+
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
@@ -55,7 +58,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 
@@ -90,6 +93,12 @@ if NOT %ERRORLEVEL% == 1 (
 
 taskkill /F /IM "mspdbsrv.exe"
 
+
+if %SAT_DEBUG% == 1 (
+    xcopy %PRODUCT_INSTALL%\win64\vc14\bind %PRODUCT_INSTALL%\win64\vc14\bin  /E /I /Q
+    xcopy %PRODUCT_INSTALL%\win64\vc14\lib %PRODUCT_INSTALL%\win64\vc14\lib  /E /I /Q
+)
+
 echo.
 echo ########## END