From 758c258e8001652798d23d7b0b5bd6df3ae8ccb0 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 31 Oct 2024 13:06:43 +0100 Subject: [PATCH] Debian/Trixie: sat generate a lot of warnings #8 --- products/EFICAS.pyconf | 2 +- products/EFICAS_TOOLS.pyconf | 2 +- products/GEOM.pyconf | 4 ++-- products/GUI.pyconf | 2 +- products/KERNEL.pyconf | 6 +++--- products/LIBBATCH.pyconf | 10 +++++----- products/NETGENPLUGIN.pyconf | 2 +- products/SHAPER.pyconf | 2 +- products/SMESH.pyconf | 4 ++-- products/embree.pyconf | 2 +- products/llvm.pyconf | 2 +- products/openVKL.pyconf | 2 +- products/ospray.pyconf | 4 ++-- products/pmml.pyconf | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/products/EFICAS.pyconf b/products/EFICAS.pyconf index f3f7872..d6faa9a 100644 --- a/products/EFICAS.pyconf +++ b/products/EFICAS.pyconf @@ -34,7 +34,7 @@ default : default_win: { - cmake_options : " -DSALOME_GUI_BUILD_WITH_QT5:BOOL=ON -DPYTHON_ROOT_DIR=%PYTHON_ROOT_DIR:\=/% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/% -DPYTHON_INCLUDE_PATH:STRING=%PYTHON_ROOT_DIR:\=/%/include -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib" + cmake_options : " -DSALOME_GUI_BUILD_WITH_QT5:BOOL=ON -DPYTHON_ROOT_DIR=%PYTHON_ROOT_DIR% -DPYTHON_EXECUTABLE=%PYTHONBIN% -DPYTHON_INCLUDE_PATH:STRING=%PYTHON_ROOT_DIR%/include -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR%/libs/python%PYTHON_VERSION:.=%.lib" } version_7_2_0 : diff --git a/products/EFICAS_TOOLS.pyconf b/products/EFICAS_TOOLS.pyconf index 71ce63d..98c3d86 100644 --- a/products/EFICAS_TOOLS.pyconf +++ b/products/EFICAS_TOOLS.pyconf @@ -32,5 +32,5 @@ default_win : { build_source : "cmake" depend : ['PyQt', 'Sphinx', 'zlib'] - cmake_options : ' -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/% -DWITH_TELEMAC_CATA=ON -DSALOME_GUI_BUILD_WITH_QT5:BOOL=ON -DBUILD_DOC=ON -DPYTHON_ROOT_DIR=%PYTHON_ROOT_DIR:\=/% -DPYTHON_INCLUDE_PATH:STRING=%PYTHON_ROOT_DIR:\=/%/include -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib -DPYUIC5=%PYUIC5:\=/%' + cmake_options : ' -DPYTHON_EXECUTABLE=%PYTHONBIN% -DWITH_TELEMAC_CATA=ON -DSALOME_GUI_BUILD_WITH_QT5:BOOL=ON -DBUILD_DOC=ON -DPYTHON_ROOT_DIR=%PYTHON_ROOT_DIR% -DPYTHON_INCLUDE_PATH:STRING=%PYTHON_ROOT_DIR%/include -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR%/libs/python%PYTHON_VERSION:.=%.lib -DPYUIC5=%PYUIC5%' } diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf index 894af17..80bf794 100644 --- a/products/GEOM.pyconf +++ b/products/GEOM.pyconf @@ -56,7 +56,7 @@ default : default_win : { - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR:\=/% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS:\=/% " + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS% " depend : ["KERNEL", "GUI", "boost", @@ -86,7 +86,7 @@ version_V9_10_0: version_V9_10_0_win : { - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR:\=/% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS:\=/% " + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS% " depend : ["KERNEL", "GUI", "boost", diff --git a/products/GUI.pyconf b/products/GUI.pyconf index 97fef0e..b59608c 100644 --- a/products/GUI.pyconf +++ b/products/GUI.pyconf @@ -49,7 +49,7 @@ default : default_win : { - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_BUILD_WITH_QT5:BOOL=ON " + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DSALOME_BUILD_WITH_QT5:BOOL=ON " depend : ["KERNEL", "Python", "qt", diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index ddd299e..acc2704 100644 --- a/products/KERNEL.pyconf +++ b/products/KERNEL.pyconf @@ -52,7 +52,7 @@ default : default_win : { - cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"%BOOST_VERSION% %BOOST_VERSION_MajorMinor%\" -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% -DBOOST_LIBRARYDIR=%BOOST_LIBRARY_DIR:\=/%b -DSALOME_USE_64BIT_IDS=ON " + cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"%BOOST_VERSION% %BOOST_VERSION_MajorMinor%\" -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR% -DBOOST_LIBRARYDIR=%BOOST_LIBRARY_DIR%b -DSALOME_USE_64BIT_IDS=ON " depend : ["Python", "boost", "numpy", @@ -283,7 +283,7 @@ ALAMOS_SALOME_9_win : { name : "KERNEL" build_source : "cmake" - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe" + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe" depend : ["Python", "boost", "numpy", @@ -322,7 +322,7 @@ version_ALAMOS_SALOME_9_10_0_win : { name : "KERNEL" build_source : "cmake" - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe" + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe" depend : ["Python", "boost", "numpy", diff --git a/products/LIBBATCH.pyconf b/products/LIBBATCH.pyconf index d3f8259..a65ef5a 100755 --- a/products/LIBBATCH.pyconf +++ b/products/LIBBATCH.pyconf @@ -30,7 +30,7 @@ default : default_win : { - cmake_options : ' -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe' + cmake_options : ' -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe' depend : [ "Python", "pthreads" ] } @@ -42,7 +42,7 @@ version_V2_5_0: version_V2_5_0_win: { - cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 ' + cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 ' properties: { incremental : 'yes' @@ -57,7 +57,7 @@ version_V2_4_6: version_V2_4_6_win: { - cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 ' + cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 ' properties: { incremental : 'yes' @@ -72,7 +72,7 @@ version_V2_4_5: version_V2_4_5_win: { - cmake_options : ' -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 ' + cmake_options : ' -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 ' } version_V2_4_4: @@ -82,5 +82,5 @@ version_V2_4_4: version_V2_4_4_win: { - cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe ' + cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe ' } diff --git a/products/NETGENPLUGIN.pyconf b/products/NETGENPLUGIN.pyconf index 8169518..eac3fbd 100755 --- a/products/NETGENPLUGIN.pyconf +++ b/products/NETGENPLUGIN.pyconf @@ -50,7 +50,7 @@ default : default_win : { - cmake_options : " -DZLIB_LIBRARY=%ZLIB_BIN:\=/% -DZLIB_INCLUDE_DIR=%ZLIB_INCLUDE_DIR:\=/% -DSALOME_CXX_STANDARD=17 " + cmake_options : " -DZLIB_LIBRARY=%ZLIB_BIN% -DZLIB_INCLUDE_DIR=%ZLIB_INCLUDE_DIR% -DSALOME_CXX_STANDARD=17 " depend : [ "KERNEL", "MEDCOUPLING", diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index 5305b2f..bb1f9b9 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -54,7 +54,7 @@ default : default_win : { - cmake_options : " -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DADD_COMPATIBILITY_TESTS=ON -DADD_MODELS_TESTS=ON -DADD_HDF_TESTS=ON" + cmake_options : " -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DADD_COMPATIBILITY_TESTS=ON -DADD_MODELS_TESTS=ON -DADD_HDF_TESTS=ON" } version_V9_12_0_DB12 : diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf index de886af..7ea4e86 100644 --- a/products/SMESH.pyconf +++ b/products/SMESH.pyconf @@ -62,7 +62,7 @@ default : default_win : { - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_SMESH_USE_CGNS:BOOL=ON -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF -DSALOME_SMESH_USE_TBB=ON" + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DSALOME_SMESH_USE_CGNS:BOOL=ON -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF -DSALOME_SMESH_USE_TBB=ON" depend : ["KERNEL", "GUI", "GEOM", @@ -163,7 +163,7 @@ version_V9_3_0 : version_V9_3_0_win : { - cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_SMESH_USE_CGNS:BOOL=ON -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF" + cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR%/bin/swig.exe -DSALOME_SMESH_USE_CGNS:BOOL=ON -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF" } # Starting from SALOME 9.4.0, we use tbb as product and build SMESH using it to accelerate its performances diff --git a/products/embree.pyconf b/products/embree.pyconf index f583888..f019c38 100644 --- a/products/embree.pyconf +++ b/products/embree.pyconf @@ -20,7 +20,7 @@ default : default_win : { - cmake_options : ' -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TUTORIALS=OFF -DEMBREE_TASKING_SYSTEM=TBB -DTBB_ROOT=%TBB_DIR:\=/% ' + cmake_options : ' -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TUTORIALS=OFF -DEMBREE_TASKING_SYSTEM=TBB -DTBB_ROOT=%TBB_DIR% ' depend : ['ispc','tbb'] properties : { diff --git a/products/llvm.pyconf b/products/llvm.pyconf index d7a733c..b5dd161 100644 --- a/products/llvm.pyconf +++ b/products/llvm.pyconf @@ -38,7 +38,7 @@ version_8_0_1_clang : version_8_0_1_clang_win : { - cmake_options : ' -DCMAKE_INSTALL_PREFIX=%LLVM_ROOT_DIR% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DPYTHON_EXECUTABLE:STRING=%PYTHON_ROOT_DIR:\=/%/python.exe -DLLVM_INSTALL_UTILS:BOOL=ON -DLLVM_ENABLE_DUMP:BOOL=ON -Thost=x64' + cmake_options : ' -DCMAKE_INSTALL_PREFIX=%LLVM_ROOT_DIR% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DPYTHON_EXECUTABLE:STRING=%PYTHON_ROOT_DIR%/python.exe -DLLVM_INSTALL_UTILS:BOOL=ON -DLLVM_ENABLE_DUMP:BOOL=ON -Thost=x64' depend : [ 'Python' ] archive_info: { diff --git a/products/openVKL.pyconf b/products/openVKL.pyconf index b63dbbb..edf3573 100644 --- a/products/openVKL.pyconf +++ b/products/openVKL.pyconf @@ -22,7 +22,7 @@ default : default_win: { build_source : "cmake" - cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%" + cmake_options : "-DBUILD_TESTING=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF -Dembree_DIR:PATH=%EMBREE_ROOT_DIR%" properties : { incremental : "yes" diff --git a/products/ospray.pyconf b/products/ospray.pyconf index 30d6a62..f7e8afe 100644 --- a/products/ospray.pyconf +++ b/products/ospray.pyconf @@ -20,7 +20,7 @@ default : default_win : { - cmake_options : ' -Dembree_DIR=%embree_DIR:\=/% -DTBB_ROOT=%TBB_DIR:\=/% -DOSPRAY_TASKING_SYSTEM=TBB -DOSPRAY_ENABLE_APPS=OFF -DOSPRAY_ENABLE_TUTORIALS=OFF ' + cmake_options : ' -Dembree_DIR=%embree_DIR% -DTBB_ROOT=%TBB_DIR% -DOSPRAY_TASKING_SYSTEM=TBB -DOSPRAY_ENABLE_APPS=OFF -DOSPRAY_ENABLE_TUTORIALS=OFF ' depend : ['embree'] properties : { @@ -37,7 +37,7 @@ version_2_4_0 : version_2_4_0_win : { - cmake_options : ' -Dembree_DIR=%embree_DIR:\=/% -DTBB_ROOT=%TBB_DIR:\=/% -DOSPRAY_TASKING_SYSTEM=TBB -DOSPRAY_ENABLE_APPS=OFF -DOSPRAY_ENABLE_TUTORIALS=OFF ' + cmake_options : ' -Dembree_DIR=%embree_DIR% -DTBB_ROOT=%TBB_DIR% -DOSPRAY_TASKING_SYSTEM=TBB -DOSPRAY_ENABLE_APPS=OFF -DOSPRAY_ENABLE_TUTORIALS=OFF ' depend : ['embree','openVKL', 'rkCommon', 'tbb'] } diff --git a/products/pmml.pyconf b/products/pmml.pyconf index 104a49e..17d58cf 100644 --- a/products/pmml.pyconf +++ b/products/pmml.pyconf @@ -30,7 +30,7 @@ default : default_win : { - cmake_options : "-DCPPUNIT_ROOT_DIR=%CPPUNIT_ROOT_DIR:\=/%" + cmake_options : "-DCPPUNIT_ROOT_DIR=%CPPUNIT_ROOT_DIR%" properties : { incremental : "yes" -- 2.39.2