Merge branch 'bos/23995' into master

[tools/sat_salome.git] / products / compil_scripts / freetype.bat

diff --git a/products/compil_scripts/freetype.bat b/products/compil_scripts/freetype.bat
index f36414f081fc1e15cb70666cb6ece881f852acda..60a1b9f06a96c8ed9def093c0c8790afbf474bf4 100755 (executable)
--- a/products/compil_scripts/freetype.bat
+++ b/products/compil_scripts/freetype.bat
@@ -9,10 +9,9 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir  %PRODUCT_INSTALL%\r
 \r
@@ -21,15 +20,12 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%\r
 \r
 cd %BUILD_DIR%\r
+set CMAKE_OPTIONS=\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE\r
-if defined CMAKE_GENERATOR (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-) else (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-)\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
 set MSBUILDDISABLENODEREUSE=1\r
 \r
 echo.\r
@@ -46,7 +42,7 @@ if NOT %ERRORLEVEL% == 0 (
 \r
 echo.\r
 echo *********************************************************************\r
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj"\r
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj\r
 echo *********************************************************************\r
 echo.\r
 \r
@@ -70,11 +66,18 @@ if NOT %ERRORLEVEL% == 0 (
 \r
 echo.\r
 echo *********************************************************************\r
-echo *** COPY Freetype DLL file from %BUILD_DIR% to %PRODUCT_INSTALL%\r
+echo *** COPY Freetype DLL files from %BUILD_DIR% to %PRODUCT_INSTALL%\r
 echo *********************************************************************\r
 echo.\r
 if NOT exist "%PRODUCT_INSTALL%\bin"     mkdir  %PRODUCT_INSTALL%\bin\r
-copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll \r
+if %SAT_DEBUG% == 0 (\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll\r
+) else (\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.lib %PRODUCT_INSTALL%\lib\\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.dll %PRODUCT_INSTALL%\bin\\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetyped.dll %PRODUCT_INSTALL%\bin\Freetype.dll\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetyped.lib %PRODUCT_INSTALL%\lib\Freetype.lib\r
+)\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR when copying Freetype DLL\r
     exit 2\r