X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Fnlopt.bat;h=bbfa6ccdc36c1ff0d1648c65eaf20b0912302ee7;hb=1dc9ca7dd7a818eae976fbc89ac15a8362862b41;hp=04ad47d8fb255cf712bba9d6230a4d37261e7159;hpb=91daaa31089da8e711912e06acfe588ab42b58f2;p=tools%2Fsat_salome.git diff --git a/products/compil_scripts/nlopt.bat b/products/compil_scripts/nlopt.bat index 04ad47d..bbfa6cc 100644 --- a/products/compil_scripts/nlopt.bat +++ b/products/compil_scripts/nlopt.bat @@ -14,7 +14,7 @@ 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 ) @@ -33,10 +33,9 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_OCTAVE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_GUILE:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe if %PLATFORM_TARGET% == Win32 ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 -g "Visual Studio 2019" -) else ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0 ) +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR% set MSBUILDDISABLENODEREUSE=1 @@ -54,7 +53,8 @@ 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.