From: Nabil Ghodbane Date: Wed, 19 May 2021 07:23:48 +0000 (+0200) Subject: NLOPT - fix - windows URANIE X-Git-Tag: V9_7_0~21 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d34732b8500e3777a975e35db572f3b959d08034;p=tools%2Fsat_salome.git NLOPT - fix - windows URANIE --- diff --git a/products/compil_scripts/nlopt.bat b/products/compil_scripts/nlopt.bat index 04ad47d..c125dcd 100644 --- a/products/compil_scripts/nlopt.bat +++ b/products/compil_scripts/nlopt.bat @@ -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.