Skip to content

Commit 03d7415

Browse files
committed
new fix for findTFEL.cmake
1 parent 895d3a4 commit 03d7415

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

cmake/modules/FindTFEL.cmake

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
# - TFEL_VERSION
1313

1414
if(DEFINED TFEL_DIR)
15-
set(TFELHOME "${TFEL_DIR}")
16-
else()
17-
if(DEFINED ENV{TFELHOME})
18-
set(TFELHOME "$ENV{TFELHOME}")
19-
endif()
15+
list(APPEND CMAKE_PREFIX_PATH "${TFEL_DIR}")
16+
endif()
17+
18+
if(DEFINED ENV{TFELHOME})
19+
set(TFELHOME "$ENV{TFELHOME}")
20+
list(APPEND CMAKE_PREFIX_PATH "$ENV{TFELHOME}/share/tfel/cmake")
2021
endif()
22+
2123
message(STATUS "tfelhome: ${TFELHOME}")
2224

2325
foreach(tool mfront tfel-check tfel-config mfront-query)
@@ -86,7 +88,7 @@ IF(TFEL_CONFIG AND MFRONT AND MFRONT_QUERY)
8688
endif()
8789

8890
foreach(lib ${tfel_libs})
89-
find_package(${lib} REQUIRED HINTS "${TFELHOME}/share/tfel/cmake")
91+
find_package(${lib} REQUIRED)
9092
find_library(${lib}_LIBRARY ${lib} HINTS ${TFELHOME} PATH_SUFFIXES lib)
9193
list(APPEND TFEL_LIBRARIES ${${lib}_LIBRARY})
9294
endforeach(lib)

0 commit comments

Comments
 (0)