]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
NLOPT - fix - windows URANIE
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Wed, 19 May 2021 07:23:48 +0000 (09:23 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Wed, 19 May 2021 07:23:48 +0000 (09:23 +0200)
products/compil_scripts/nlopt.bat

index 04ad47d8fb255cf712bba9d6230a4d37261e7159..c125dcdb6da97106d3584b47a8590495ea553539 100644 (file)
@@ -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.