[MC] Conf flag '-enable-mc-debug' to build $exec_debug with MC compiled in Debug

Author: abruneton

DEVELOPER_NOTES

@@ -1,6 +1,7 @@
 -------------------------------------------------------------
 Developer notes version 1.9.4_beta : Changes since version 1.9.3 :
 -------------------------------------------------------------
+30/04/24 (TRUST) Debug        : Flag 'enable-mc-debug' can be used to compile (and link only with $exec_debug) MEDCoupling library in Debug mode.
 24/04/24 (TRUST) NR Tests     : make check_mode and make ctest_mode does not scan validation forms if no validation form has been modified since last check.
 11/04/24 (TRUST) NR Tests     : Environment variable TRUST_CREATE_TESTS_FROM_VALIDATION_FORMS removed, make ctest_MODE does now a smart check of tests issued from validation forms.
 22/03/24 (TRUST) Major change : mklibs script now generates only what is necessary for CMake. Old building mode (autotools) not supported anymore. File make.liba not generated anymore.

Outils/ICoCo/ICoCo_src/share/swig/CMakeLists.txt

@@ -10,7 +10,7 @@ project(ICoCo_SWIG CXX)
 enable_testing()
 
 set(TRUST_ROOT $ENV{TRUST_ROOT})
-set(MEDCOUPLING_DIR $ENV{TRUST_MEDCOUPLING_ROOT})
+set(MEDCOUPLING_DIR "$ENV{TRUST_MEDCOUPLING_ROOT}/$ENV{TRUST_ARCH}_opt")
 
 if(NOT $ENV{TRUST_ARCH_CC} STREQUAL "linux_nvc++")
 add_definitions(-Wno-error)

Outils/TRUST_STATS_JUPYTER/stats/trust_statistical_tools_IJK.py

@@ -12,7 +12,8 @@
 import sys, os
 
 mcr = os.environ["TRUST_MEDCOUPLING_ROOT"]
-sub = "lib/python%d.%d/site-packages" % (sys.version_info.major, sys.version_info.minor)
+arch = os.environ["TRUST_ARCH"]
+sub = "%s_opt/lib/python%d.%d/site-packages" % (arch, sys.version_info.major, sys.version_info.minor)
 sys.path.append(os.path.join(mcr, sub))
 sys.path.append(os.path.join(mcr, "bin"))
 try:

Outils/VisIt/plugins/lata/build_plugin

@@ -51,7 +51,7 @@ if [ ! -d ${Build} ]; then
     echo "# Compiling $plugin plugin..."
     # Regroupement des sources du plugin depuis le Kernel:
     MED="-with_med"
-    [ ! -f $TRUST_MED_ROOT/lib/libmed.a ] || [ ! -f $TRUST_MEDCOUPLING_ROOT/lib/libmedloader.a ] && MED=""
+    [ ! -f $TRUST_MED_ROOT/lib/libmed.a ] || [ ! -f $TRUST_MEDCOUPLING_ROOT/${TRUST_ARCH}_opt/lib/libmedloader.a ] && MED=""
     $DIR/src/generate_lata_xml.sh "$all_srcs" $MED
 
    env LD_LIBRARY_PATH=$TRUST_ROOT/exec/python/lib:$LD_LIBRARY_PATH $local/xml2info lata.xml 

Outils/VisIt/plugins/lata/src/generate_lata_xml.sh

@@ -6,14 +6,15 @@ all_srcs=$1  # All plugin sources ...
 if [ "$2" = "-with_med" ]; then
     echo "  -> with MED support"
     med_extension="*.med"
-    med_cxx_flags="-DNDEBUG -DWITH_MEDLOADER -I"${TRUST_MEDCOUPLING_ROOT}"/include/ -I"${TRUST_MED_ROOT}"/include"
-    med_libs="${TRUST_MEDCOUPLING_ROOT}/lib/libmedloader.a    ${TRUST_MEDCOUPLING_ROOT}/lib/libmedcouplingremapper.a ${TRUST_MEDCOUPLING_ROOT}/lib/libmedcoupling.a  ${TRUST_MEDCOUPLING_ROOT}/lib/libinterpkernel.a ${TRUST_MED_ROOT}/lib/libmed.a ${TRUST_MED_ROOT}/lib/libmedimport.a ${TRUST_MED_ROOT}/lib/libmedC.a ${TRUST_MED_ROOT}/lib/libhdf5.a -lz -lm  "  
+    medc_root="${TRUST_MEDCOUPLING_ROOT}/${TRUST_ARCH}_opt"
+    med_cxx_flags="-DNDEBUG -DWITH_MEDLOADER -I${medc_root}/include/ -I${TRUST_MED_ROOT}/include"
+    med_libs="${medc_root}/lib/libmedloader.a  ${medc_root}/lib/libmedcouplingremapper.a ${medc_root}/lib/libmedcoupling.a ${medc_root}/lib/libinterpkernel.a ${TRUST_MED_ROOT}/lib/libmed.a ${TRUST_MED_ROOT}/lib/libmedimport.a ${TRUST_MED_ROOT}/lib/libmedC.a ${TRUST_MED_ROOT}/lib/libhdf5.a -lz -lm  "  
 fi
 
 extra_incl=" -I${TRUST_ROOT}/src/Kernel/Utilitaires -I${TRUST_ROOT}/src/Kernel/Math -I${TRUST_ROOT}/src/Kernel/Geometrie "
 def_latatools=" -DLATATOOLS=1 "
 
-# -Wno-depreacted ne marche pas sous windows
+# -Wno-deprecated ne marche pas sous windows
 cat > lata.xml <<EOF
 <?xml version="1.0"?>
   <Plugin name="lata" type="database" label="lata import file" version="1.0" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="false" hasoptions="false">

Outils/lata_tools/Makefile

@@ -17,7 +17,7 @@ all: $(trg)
 OPT=_opt
 include $(TRUST_ENV)/make.$(TRUST_ARCH_CC)$(OPT)
 
-$(trg): $(tools_src)/CMakeLists.txt $(tools_src)/tools/CMakeLists.txt $(tools_src)/scripts/CMakeLists.txt $(tools_src)/build.sh Makefile $(TRUST_MEDCOUPLING_ROOT)/lib/libmedcoupling.a $(SRCS) $(EXTRA_SRCS)
+$(trg): $(tools_src)/CMakeLists.txt $(tools_src)/tools/CMakeLists.txt $(tools_src)/scripts/CMakeLists.txt $(tools_src)/build.sh Makefile $(TRUST_MEDCOUPLING_ROOT)/$(TRUST_ARCH)_opt/lib/libmedcoupling.a $(SRCS) $(EXTRA_SRCS)
 	(cd $(tools_src);env TRUST_DEFINES="$(Defines)" EXTRA_SRCS="$(EXTRA_SRCS)" ./build.sh)
 	(cd $(TRUST_ROOT)/exec;ln -sf lata_tools/bin/lata_analyzer .)
 	(cd $(TRUST_ROOT)/exec;ln -sf lata_tools/bin/compare_lata .)

Outils/lata_tools/src/CMakeLists.txt

@@ -17,7 +17,7 @@ set (TRUST_INT64 $ENV{TRUST_INT64})
 if ("${MED_COUPLING_ROOT}"  STREQUAL "" )
    set (MED_COUPLING_ROOT_ENV $ENV{MED_COUPLING_ROOT})
    if (NOT "${MED_COUPLING_ROOT_ENV}"  STREQUAL "" )
-     set (med_dir ${MED_COUPLING_ROOT_ENV}) 
+     set (med_dir "${MED_COUPLING_ROOT_ENV}/$ENV{TRUST_ARCH}_opt") 
      set (loadercpp on)
    endif()
 else()