From fd1c856afc3d3d0925737a00443153a371299c31 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 11 Feb 2021 14:35:27 -0600 Subject: [PATCH] [CMAKE] Add version info for MEDfile --- cMake/FindMEDFile.cmake | 12 ++++++++++++ cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cMake/FindMEDFile.cmake b/cMake/FindMEDFile.cmake index 0cf8980dac..13af50bc48 100644 --- a/cMake/FindMEDFile.cmake +++ b/cMake/FindMEDFile.cmake @@ -5,6 +5,7 @@ # MEDFILE_LIBRARIES # MEDFILE_C_LIBRARIES # MEDFILE_F_LIBRARIES +# MEDFILE_VERSION # # The CMake (or environment) variable MEDFILE_ROOT_DIR can be set to # guide the detection and indicate a root directory to look into. @@ -56,3 +57,14 @@ ENDIF(MEDFILE_F_LIBRARIES) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDFile REQUIRED_VARS MEDFILE_INCLUDE_DIRS MEDFILE_LIBRARIES) + +IF(meddotH) + FILE(READ "${meddotH}" _med_h) + STRING(REGEX MATCH "define[ \t]+MED_MAJOR_NUM[ \t]+([0-9?])" _med_major_version_match "${_med_h}") + SET(MED_MAJOR_VERSION "${CMAKE_MATCH_1}") + STRING(REGEX MATCH "define[ \t]+MED_MINOR_NUM[ \t]+([0-9?])" _med_minor_version_match "${_med_h}") + SET(MED_MINOR_VERSION "${CMAKE_MATCH_1}") + STRING(REGEX MATCH "define[ \t]+MED_RELEASE_NUM[ \t]+([0-9?])" _med_release_version_match "${_med_h}") + SET(MED_RELEASE_VERSION "${CMAKE_MATCH_1}") + SET(MEDFILE_VERSION "${MED_MAJOR_VERSION}.${MED_MINOR_VERSION}.${MED_RELEASE_VERSION}") +ENDIF() diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index 2d29e45ed9..2146c2d53e 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -33,7 +33,7 @@ macro(PrintFinalReport) message(STATUS "ZLIB: ${ZLIB_VERSION_STRING}") - message(STATUS "PyCXX: [${PYCXX_INCLUDE_DIR}]") + message(STATUS "PyCXX: ${PYCXX_VERSION} [${PYCXX_INCLUDE_DIR}]") message(STATUS "OCC: ${OCC_VERSION_STRING} [${OCC_LIBRARIES}] [${OCC_LIBRARY_DIR}] [${OCC_INCLUDE_DIR}]") @@ -42,7 +42,7 @@ macro(PrintFinalReport) message(STATUS "SMESH: ${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}") else(FREECAD_USE_EXTERNAL_SMESH) message(STATUS "SMESH: build internal") - message(STATUS " MEDFile: [${MEDFILE_LIBRARIES}] [${MEDFILE_INCLUDE_DIRS}]") + message(STATUS " MEDFile: ${MEDFILE_VERSION} [${MEDFILE_LIBRARIES}] [${MEDFILE_INCLUDE_DIRS}]") message(STATUS " HDF5: ${HDF5_VERSION}") message(STATUS " VTK: ${VTK_VERSION}") endif(FREECAD_USE_EXTERNAL_SMESH)