From 10cb5b729d79725da85b8bea54fb1e2bc86f628c Mon Sep 17 00:00:00 2001 From: nghodban Date: Sun, 6 Dec 2020 14:27:38 +0100 Subject: [PATCH] bos #20096 [CEA][Windows] Integration of graphviz 2.44.1 - dot -c was missing --- products/compil_scripts/graphviz-2.44.1.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat index 2562abd..43a0b2e 100644 --- a/products/compil_scripts/graphviz-2.44.1.bat +++ b/products/compil_scripts/graphviz-2.44.1.bat @@ -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. -- 2.30.2