From 88cbf7fa3c571f8043fcacc38ca952aeb3c3847c Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 3 Dec 2021 11:30:15 +0100 Subject: [PATCH] Windows SALOME master debug: llvm in release mode --- applications/SALOME-9.8.0-windows.pyconf | 5 -- applications/SALOME-master-windows.pyconf | 2 + products/compil_scripts/llvm-8.0.1.bat | 63 +++++++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 products/compil_scripts/llvm-8.0.1.bat diff --git a/applications/SALOME-9.8.0-windows.pyconf b/applications/SALOME-9.8.0-windows.pyconf index 330fad0..55b845d 100644 --- a/applications/SALOME-9.8.0-windows.pyconf +++ b/applications/SALOME-9.8.0-windows.pyconf @@ -192,9 +192,4 @@ APPLICATION : __overwrite__ : [ - { - __condition__ : "APPLICATION.debug == 'yes'" - 'APPLICATION.products.numpy' : '1.16.4-win-dbg' - 'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg' - } ] diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 39bdd8e..bc20b49 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -196,5 +196,7 @@ __overwrite__ : __condition__ : "APPLICATION.debug == 'yes'" 'APPLICATION.products.numpy' : '1.16.4-win-dbg' 'APPLICATION.products.sphinxintl' : '2.0.0-win-dbg' + 'PRODUCTS.llvm.version_8_0_1_clang_win.build_source' : 'script' + 'PRODUCTS.llvm.version_8_0_1_clang_win.compil_script' : 'llvm-8.0.1.bat' } ] diff --git a/products/compil_scripts/llvm-8.0.1.bat b/products/compil_scripts/llvm-8.0.1.bat new file mode 100644 index 0000000..c0fbc05 --- /dev/null +++ b/products/compil_scripts/llvm-8.0.1.bat @@ -0,0 +1,63 @@ +@echo off + +echo ########################################################################## +echo llvm %VERSION% +echo ########################################################################## + +REM NGH: no need to build this in debug mode +SET PRODUCT_BUILD_TYPE=Release + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + +cd %BUILD_DIR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE:STRING=%PYTHON_ROOT_DIR:\=/%/python.exe +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLLVM_INSTALL_UTILS:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLLVM_ENABLE_DUMP:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Thost=x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING="Visual Studio 15 2017 Win64" +set MSBUILDDISABLENODEREUSE=1 + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo "ERROR on cmake" + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild gmsh.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) +echo. +echo ########## END -- 2.39.2