merge from master

[tools/sat_salome.git] / products / compil_scripts / zlib-1.2.5.bat

diff --git a/products/compil_scripts/zlib-1.2.5.bat b/products/compil_scripts/zlib-1.2.5.bat
index 96487ab260321dc5e54f3bd49c428df0aedd7774..abe35832bf814269cdc74d5cdf875fda5eee76f5 100644 (file)
--- a/products/compil_scripts/zlib-1.2.5.bat
+++ b/products/compil_scripts/zlib-1.2.5.bat
@@ -14,15 +14,22 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+
+REM remove zconf.h - one could also patch the CMakeLists.txt file...
+cd  %SOURCE_DIR%
+rm -f zconf.h
+
+
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%
 
+
 cd %BUILD_DIR%
 set CMAKE_OPTIONS=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
@@ -48,13 +55,13 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 
 msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj
 if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on msbuild gmsh.vcxproj
+    echo ERROR on msbuild ALL_BUILD.vcxproj
     exit 2
 )
 
@@ -70,5 +77,10 @@ if NOT %ERRORLEVEL% == 0 (
     exit 3
 )
 
+if %SAT_DEBUG% == 1 (
+  copy /Y /B  %PRODUCT_INSTALL%\lib\zlibd.lib %PRODUCT_INSTALL%\lib\zlib.lib
+  copy /Y /B  %PRODUCT_INSTALL%\bin\zlibd1.dll %PRODUCT_INSTALL%\bin\zlib1.dll
+)
+
 echo.
 echo ########## END