Hopefully more robust and handy detection of the TFEL libraries

Author: thelfer

CMakeLists.txt

@@ -148,13 +148,16 @@ if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
 endif(CMAKE_BUILD_TYPE STREQUAL "Coverage")
 
 #detecting TFEL and MFront
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-find_package(TFEL)
-if(TFEL_FOUND)
-  include(tfel)
-  include(material-properties)
-  include(behaviours)
-endif(TFEL_FOUND)
+option(disable-tfel "explicitly disable TFEL support. By default, MGIS tries to use TFEL for tests and MGIS/Function" OFF)
+if(NOT disable-tfel)
+  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+  find_package(TFEL)
+  if(TFEL_FOUND)
+    include(tfel)
+    include(material-properties)
+    include(behaviours)
+  endif(TFEL_FOUND)
+endif(NOT disable-tfel)
 
 #documentations
 option(enable-doxygen-doc "enable generation of the Doxygen documentation" OFF)
@@ -229,9 +232,7 @@ endif(CMAKE_CONFIGURATION_TYPES)
 
 add_subdirectory(include)
 add_subdirectory(src)
-if(MGIS_HAVE_TFEL)
-  add_subdirectory(tests)
-endif(MGIS_HAVE_TFEL)
+add_subdirectory(tests)
 add_subdirectory(bindings)
 
 # Packaging

INSTALL-cmake.md

@@ -55,6 +55,9 @@ Options
 - `enable-static`: compiles static libraries
 - `enable-doxygen-doc`: enable the generation of the API documentation
   using with `Doxygen`.
+- `disable-tfel`: by default, `MGIS` tries to add support for `TFEL`,
+  notably if `tfel-config` is found in the `PATH`. This option disables
+  this behaviour.
 
 `cmake` usefull variables
 =======================
@@ -67,6 +70,7 @@ Options
   			         version of python shall be passed, not
   			         the revision version or the detection
   			         fails.
+- `TFEL_DIR`                   : specify the directory where to find TFEL
 
 `cmake` typical usage
 =====================

bindings/c/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_subdirectory(include)
 add_subdirectory(src)
-if(MGIS_HAVE_TFEL)
+if(MGIS_HAVE_MFRONT_SUPPORT)
   add_subdirectory(tests)
-endif(MGIS_HAVE_TFEL)
+endif(MGIS_HAVE_MFRONT_SUPPORT)

bindings/fortran/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_subdirectory(src)
 add_subdirectory(modules)
-if(MGIS_HAVE_TFEL)
+if(MGIS_HAVE_MFRONT_SUPPORT)
   add_subdirectory(tests)
-endif(MGIS_HAVE_TFEL)
+endif(MGIS_HAVE_MFRONT_SUPPORT)
 

bindings/python/CMakeLists.txt

@@ -19,6 +19,6 @@ endif(MGIS_APPEND_SUFFIX)
 
 add_subdirectory(src)
 add_subdirectory(mgis)
-if(MGIS_HAVE_TFEL)
+if(MGIS_HAVE_MFRONT_SUPPORT)
   add_subdirectory(tests)
-endif(MGIS_HAVE_TFEL)
+endif(MGIS_HAVE_MFRONT_SUPPORT)

cmake/modules/FindTFEL.cmake

@@ -4,24 +4,39 @@
 # set(TFELHOME ${CONAN_TFEL_ROOT})
 # find_package(TFEL REQUIRED)
 #
-# Once found, declares these variables:
-#   - TFEL_FOUND
+# If a suitable environment is found to compile MFront behaviours,
+# the following variables are declared:
+#   - MGIS_HAVE_MFRONT_SUPPORT
 #   - TFEL_INCLUDE_PATH
 #   - TFEL_LIBRARIES
 #   - TFEL_CXX_STANDARD
 #   - TFEL_VERSION
+#
+# If TFEL libraries are found, the following variable is declared:
+#   - MGIS_HAVE_TFEL
+
+set(tfel_libs
+    TFELTests
+    TFELException
+    TFELUtilities
+    TFELMaterial
+    TFELMath
+    MTestFileGenerator
+)
 
 if(DEFINED TFEL_DIR)
   list(APPEND CMAKE_PREFIX_PATH "${TFEL_DIR}")
  endif()
 
 if(DEFINED ENV{TFELHOME})
   set(TFELHOME "$ENV{TFELHOME}")
-  list(APPEND CMAKE_PREFIX_PATH "$ENV{TFELHOME}/share/tfel/cmake")
+  if(NOT DEFINED TFEL_DIR)
+    set(TFEL_DIR "${TFELHOME}/share/tfel/cmake")
+    list(APPEND CMAKE_PREFIX_PATH "${TFEL_DIR}")
+  endif(NOT DEFINED TFEL_DIR)
+  message(STATUS "tfelhome: ${TFELHOME}")
 endif()
 
-message(STATUS "tfelhome: ${TFELHOME}")
-
 foreach(tool mfront tfel-check tfel-config mfront-query)
     string(TOUPPER ${tool} toolVar)
     string(REPLACE "-" "_" toolVar ${toolVar})
@@ -30,15 +45,27 @@ endforeach()
 
 IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
 
+  if ((NOT DEFINED TFEL_DIR) AND (NOT DEFINED ENV{TFELHOME}))
+    # Trying to figure out TFEL_DIR
+    execute_process(COMMAND ${TFEL_CONFIG} "--include-path"
+      OUTPUT_VARIABLE TFEL_INCLUDE_PATH
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+     file(TO_CMAKE_PATH "${TFEL_INCLUDE_PATH}" TFEL_INCLUDE_PATH)
+     cmake_path(GET TFEL_INCLUDE_PATH PARENT_PATH TFELHOME)
+     set(TFEL_DIR "${TFELHOME}/share/tfel/cmake")
+     list(APPEND CMAKE_PREFIX_PATH "${TFEL_DIR}")
+  endif ((NOT DEFINED TFEL_DIR) AND (NOT DEFINED ENV{TFELHOME}))
+
   execute_process(COMMAND ${TFEL_CONFIG} "--cxx-standard"
       RESULT_VARIABLE TFEL_CXX_STANDARD_AVAILABLE
       OUTPUT_VARIABLE TFEL_CXX_STANDARD
       OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   if(NOT TFEL_CXX_STANDARD_AVAILABLE EQUAL 0)
-      set(TFEL_CXX_STANDARD 11)
+      message(FATAL_ERROR "tfel-config does not support --cxx-standard")
   endif()
-  
+
   execute_process(COMMAND ${TFEL_CONFIG} "--version"
       OUTPUT_VARIABLE TFEL_VERSION_FULL
       OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -67,32 +94,19 @@ IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
   if(NOT TFEL_INCLUDE_PATH_RESULT EQUAL 0)
       message(FATAL_ERROR "call to tfel-config failed")
   endif()
+
+  foreach(lib ${tfel_libs})
+     find_library(${lib}_LIBRARY ${lib} HINTS ${TFELHOME} PATH_SUFFIXES lib)
+     list(APPEND TFEL_LIBRARIES ${${lib}_LIBRARY})
+  endforeach(lib)
 
   # find_path(TFEL_CONFIG_INCLUDE_PATH TFELConfig.hxx
   #     HINTS ${TFELHOME}/include/TFEL/Config
   # )
   # get_filename_component(TFEL_INCLUDE_PATH
   #     ${TFEL_CONFIG_INCLUDE_PATH}/../.. ABSOLUTE CACHE
   # )
-  
-  set(tfel_libs
-      TFELTests
-      TFELException
-      TFELUtilities
-      TFELMaterial
-      TFELMath
-      MTestFileGenerator
-  )
-  if(${TFEL_CXX_STANDARD} LESS 17)
-      list(APPEND tfel_libs TFELPhysicalConstants)
-  endif()
-  
-  foreach(lib ${tfel_libs})
-      find_package(${lib} REQUIRED)
-      find_library(${lib}_LIBRARY ${lib} HINTS ${TFELHOME} PATH_SUFFIXES lib)
-      list(APPEND TFEL_LIBRARIES ${${lib}_LIBRARY})
-  endforeach(lib)
-  
+      
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(TFEL DEFAULT_MSG
       TFEL_VERSION
@@ -101,10 +115,17 @@ IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
       TFEL_CXX_STANDARD
   )
 
-  set(TFEL_FOUND ON)
+  set(MGIS_HAVE_MFRONT_SUPPORT ON)
 
 else(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
 
-  set(TFEL_FOUND OFF)
+  set(MGIS_HAVE_MFRONT_SUPPORT OFF)
 
 endif(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
+
+if(DEFINED TFEL_DIR)
+  foreach(lib ${tfel_libs})
+    find_package(${lib} REQUIRED)
+  endforeach(lib)
+  set(MGIS_HAVE_TFEL ON)
+endif(DEFINED TFEL_DIR)

cmake/modules/tfel.cmake

@@ -26,4 +26,3 @@ message(STATUS "MTestFileGenerator    : ${MTestFileGenerator_LIBRARY}")
 set(TFEL_MFRONT_LIBRARIES
     ${TFEL_LIBRARIES}
     CACHE INTERNAL "")
-set(MGIS_HAVE_TFEL ON)

src/CMakeLists.txt

@@ -29,9 +29,12 @@ if(enable-mgis-function)
     BasicLinearQuadratureSpace.cxx
     Function.cxx
     Evaluator.cxx
-    TensorView.cxx
-    TensorModifier.cxx
     MaterialFunctionManager.cxx)
+  if(MGIS_HAVE_TFEL)
+    list(APPEND MFrontGenericInterface_SOURCES
+         TensorView.cxx
+         TensorModifier.cxx)
+  endif(MGIS_HAVE_TFEL)
 endif(enable-mgis-function)
 
 mgis_library(MFrontGenericInterface

tests/CMakeLists.txt

@@ -1,6 +1,8 @@
 STRING(REPLACE "\\;" ";" MGIS_PATH_STRING "$ENV{PATH}")
 STRING(REPLACE ";" "\\;" MGIS_PATH_STRING "${MGIS_PATH_STRING}")
 
+if(MGIS_HAVE_MFRONT_SUPPORT)
+
 mfront_material_properties_check_library(MaterialPropertyTest
   MaterialPropertyBoundCheck
   MaterialPropertyBoundCheck2
@@ -370,6 +372,8 @@ else((CMAKE_HOST_WIN32) AND (NOT MSYS))
     PROPERTY DEPENDS BehaviourTest)
 endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
 
+endif(MGIS_HAVE_MFRONT_SUPPORT)
+
 add_executable(InvalidResultTest
  EXCLUDE_FROM_ALL
  InvalidResultTest.cxx)
@@ -467,6 +471,8 @@ add_executable(MaterialFunctionManagerTest
 target_link_libraries(MaterialFunctionManagerTest
 	PRIVATE MFrontGenericInterface tfel::TFELTests)
 
+if(MGIS_HAVE_MFRONT_SUPPORT)
+
 add_test(NAME MaterialFunctionManagerTest
  COMMAND MaterialFunctionManagerTest "$<TARGET_FILE:BehaviourTest>")
 add_dependencies(check MaterialFunctionManagerTest)
@@ -479,6 +485,8 @@ else((CMAKE_HOST_WIN32) AND (NOT MSYS))
     PROPERTY DEPENDS BehaviourTest)
 endif((CMAKE_HOST_WIN32) AND (NOT MSYS))
 
+endif(MGIS_HAVE_MFRONT_SUPPORT)
+
 endif(MGIS_HAVE_TFEL)
 
 endif(enable-mgis-function)