From 9c8fca576ab79ac5bf6ebaff41a4d1e4a9179576 Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 24 Apr 2012 07:42:08 +0000 Subject: [PATCH] Sorry for bugs in string. Dealing with HDF5 compiled with mpi. addition of MPI_INCLUDES_DIR into HDF5_INCLUDES_DIR. Same for FLAGs and LIBS. --- salome_adm/cmake_files/FindHDF5.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salome_adm/cmake_files/FindHDF5.cmake b/salome_adm/cmake_files/FindHDF5.cmake index a5bb8eb08..cc8565428 100644 --- a/salome_adm/cmake_files/FindHDF5.cmake +++ b/salome_adm/cmake_files/FindHDF5.cmake @@ -161,13 +161,13 @@ ENDIF(HDF5_STATUS) IF(HDF5_STATUS) FILE(TO_NATIVE_PATH "${HDF5_INCLUDE_DIR}/H5public.h" HDF5_H5PUBLIC_FILE) EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import re,sys ; f=file(sys.argv[1]) ; s=f.read() ; c=re.compile('^#[\s]*include[\s]*\\\"(?P[A-Za-z0-9\-]+\.h)\\\"',re.M) ; sys.stdout.write(c.search(s).group('nm'))" + COMMAND ${PYTHON_EXECUTABLE} -c "import re,sys ; f=file(sys.argv[1]) ; s=f.read() ; c=re.compile('^#[\\s]*include[\\s]*\\\"(?P[A-Za-z0-9\\-]+\\.h)\\\"',re.M) ; sys.stdout.write(c.search(s).group('nm'))" ${HDF5_H5PUBLIC_FILE} OUTPUT_VARIABLE HDF5_H5PUBLIC_DEFS_FILE ) FILE(TO_NATIVE_PATH "${HDF5_INCLUDE_DIR}/${HDF5_H5PUBLIC_DEFS_FILE}" HDF5_H5PUBLIC_DEFS_FILE) EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import re,sys ; f=file(sys.argv[1]) ; s=f.read() ; c=re.compile('^#[\s]*define[\s]+H5_HAVE_PARALLEL[\s]+(?P[\d]+)',re.M) ; m=c.search(s); exec('if m: sys.stdout.write(m.group(\'nm\'))') ; exec('if not m:\n sys.stdout.write(\'0\');')" + COMMAND ${PYTHON_EXECUTABLE} -c "import re,sys ; f=file(sys.argv[1]) ; s=f.read() ; c=re.compile('^#[\\s]*define[\\s]+H5_HAVE_PARALLEL[\\s]+(?P[\\d]+)',re.M) ; m=c.search(s); exec('if m: sys.stdout.write(m.group(\\'nm\\'))') ; exec('if not m: sys.stdout.write(\\'0\\')')" ${HDF5_H5PUBLIC_DEFS_FILE} OUTPUT_VARIABLE HD5_HAVE_PARALLEL ) -- 2.39.2