Merge branch 'bos/23995' into master

[tools/sat_salome.git] / products / compil_scripts / graphviz-2.44.1.bat

diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat
index 2562abd71f43e9215eda7b87e090617763cfcc59..7ca56949d4d926649def7af8814551dc9f3e3653 100644 (file)
--- a/products/compil_scripts/graphviz-2.44.1.bat
+++ b/products/compil_scripts/graphviz-2.44.1.bat
@@ -10,9 +10,9 @@ IF NOT DEFINED SAT_DEBUG (
 
 SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
-REM if %SAT_DEBUG% == 1 (
-REM   set PRODUCT_BUILD_TYPE=Debug
-REM )
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=Debug
+)
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin
@@ -22,9 +22,8 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
-set PATH=%PATH%;%BUILD_DIR%\windows\dependencies\graphviz-build-utilities
-set PATH=%PATH%;%WINFLEX_ROOT_DIR%
-set CMAKE_OPTIONS=%SOURCE_DIR%
+set PATH=%SOURCE_DIR%\windows\dependencies\graphviz-build-utilities;%PATH%
+set CMAKE_OPTIONS=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS:BOOL=ON
@@ -49,7 +48,6 @@ echo *********************************************************************
 echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj"
 echo *********************************************************************
 echo.
-
 msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild ALL_BUILD.vcxproj
@@ -61,13 +59,15 @@ echo *********************************************************************
 echo *** installation...
 echo *********************************************************************
 echo.
-
 msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild INSTALL.vcxproj
     exit 3
 )
 
+SET PATH=%PRODUCT_INSTALL%\bin;%PATH%
+cd %PRODUCT_INSTALL%\bin
+dot -c
 taskkill /F /IM "mspdbsrv.exe"
 
 echo.