Merge pull request #7 from LIHPC-Computational-Geometry/dev-machinetypes-fixes

Version 7.9.4. Fixes working with Machine-types.

Author: CharlesPignerol

cmake/version.cmake

@@ -4,7 +4,7 @@
 
 set (LIMA_MAJOR_VERSION "7")
 set (LIMA_MINOR_VERSION "9")
-set (LIMA_RELEASE_VERSION "3")
+set (LIMA_RELEASE_VERSION "4")
 set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})
 
 

installation.txt

@@ -20,7 +20,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=OFF -DSUMESH:BOOL=OFF -DFORMAT_MLI:BOOL=OFF -DFORMAT_MLI2:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0  \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.3
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.4
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 
@@ -30,7 +30,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=ON -DSUMESH:BOOL=ON -DFORMAT_MLI:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0 -DHDF145_INCLUDE_DIR=/opt/hdf145/1.3.0/include -DHDF145CPP_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145_cpp.so -DHDF145_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145.so \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.3
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.4
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 

src/Lima/CMakeLists.txt

@@ -76,6 +76,7 @@ if (${MachineTypes_FOUND})
 	message (STATUS "======================> Utilisation de l'API MachineTypes")
 	set (MachineTypes_ENABLED ON)	# Pour find_depency
 	target_link_libraries (Lima PUBLIC MachineTypes::include)
+	target_compile_definitions (Lima PUBLIC __INTERNE_MACHINE_TYPES)
 	if (MachineTypes_INCLUDE_DIR)
 		target_include_directories (Lima PUBLIC ${MachineTypes_INCLUDE_DIR})
 	elseif (MachineTypes_INCLUDE_DIRS)

src/Lima/public/Lima/lima.h

@@ -119,6 +119,9 @@ extern "C" {
 
 #ifdef __INTERNE_MACHINE_TYPES
 #include <machine_types.h>
+  typedef u_int_8 LM_TYPEMASQUE ;
+  typedef u_int_8 LM_V_TYPEMASQUE ;
+  typedef u_int_8 LM_VC_TYPEMASQUE ;
 #else
   typedef unsigned long long int LM_TYPEMASQUE ;
   typedef unsigned long long int LM_V_TYPEMASQUE ;