Skip to content

Commit c184745

Browse files
committed
Conditionally remove references to TFELPhysicalConstants
1 parent d8ff738 commit c184745

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

cmake/modules/behaviours.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function(mfront_behaviours_check_library name)
2323
"${TFELException};${TFELUtilities};${TFELMath};${TFELMaterial}")
2424
else((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
2525
set(TFEL_MFRONT_LIBRARIES
26-
"${TFELException};${TFELUtilities};${TFELMath};${TFELMaterial}")
26+
"${TFELException};${TFELUtilities};${TFELMath};${TFELMaterial};${TFELPhysicalConstants}")
2727
endif((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
2828
foreach ( _ARG ${ARGN})
2929
if ( ${_ARG} MATCHES SOURCES )

cmake/modules/tfel.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
8787
find_tfel_library(TFELMath)
8888
find_tfel_library(TFELMaterial)
8989

90+
if((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
91+
else((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
92+
find_tfel_library(TFELPhysicalConstants)
93+
endif((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
9094
MESSAGE(STATUS "tfel version : ${TFEL_VERSION}")
9195
MESSAGE(STATUS "tfel C++ standard : ${TFEL_CXX_STANDARD}")
9296
MESSAGE(STATUS "mfront : ${MFRONT}")
@@ -102,6 +106,10 @@ IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
102106
MESSAGE(STATUS "TFELUtilities : ${TFELUtilities}")
103107
MESSAGE(STATUS "TFELMath : ${TFELMath}")
104108
MESSAGE(STATUS "TFELMaterial : ${TFELMaterial}")
109+
if((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
110+
else((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
111+
message(STATUS "TFELPhysicalConstants : ${TFELPhysicalConstants}")
112+
endif((TFEL_CXX_STANDARD GREATER 17) OR (TFEL_CXX_STANDARD EQUAL 17))
105113

106114
macro(add_mfront_dependency name file)
107115
set(mfront_file "${CMAKE_CURRENT_SOURCE_DIR}/${file}.mfront")

0 commit comments

Comments
 (0)