From 178315d444bf8a069fbe5b9e6572ae80aef8a714 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 14 Nov 2022 09:39:54 +0100 Subject: [PATCH] debug mode - issue with KERNEL if cmake 3.24 +swig - to be analyzed. fall back to cmake 3.12.1 until issue is understood --- applications/SALOME-master-windows.pyconf | 2 ++ products/GEOM.pyconf | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index eaba411..eb1638f 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -197,6 +197,8 @@ __overwrite__ : { __condition__ : "APPLICATION.debug == 'yes'" 'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow'] + # TODO: cmake 3.24 screws things up by adding _d suffix to debug libraries to KERNEL + 'APPLICATION.products.cmake' : {tag: '3.12.1', base: 'no', section : 'version_3_12_1' } 'APPLICATION.products.numpy' : {tag: '1.16.4', base: 'no', section : 'version_1_16_4_win_dbg' } 'APPLICATION.products.Cython' : {tag: '0.29.12', base: 'no', section : 'version_0_29_12_win_dbg' } 'APPLICATION.products.sphinxintl' : {tag: '2.0.0', base: 'no', section : 'version_2_0_0_win_dbg' } diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf index 2c8d85a..57174d9 100644 --- a/products/GEOM.pyconf +++ b/products/GEOM.pyconf @@ -53,6 +53,26 @@ 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:\=/% " + depend : ["KERNEL", + "GUI", + "boost", + "CAS", + "Python", + "hdf5", + "omniORB", + "qt", + "ParaView", + "docutils", + "Sphinx", + "Jinja2", + "setuptools", + "Pygments", + "opencv", + "six", + "pytz", + "psutil", + "sphinxintl" + ] } version_V9_4_0_to_V9_6_0 : -- 2.39.2