Skip to content

Commit

Permalink
Merge pull request #57 from ecmwf-ifs/naan-fix-fckit-fypp
Browse files Browse the repository at this point in the history
Use fckit contributed fypp even in absence of FCKIT_VENV
  • Loading branch information
pmarguinaud authored Aug 1, 2024
2 parents 7df1b88 + 9dc78b9 commit ca79ee8
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ find_program( FYPP fypp )

if( fckit_FOUND AND fckit_HAVE_FCKIT_VENV )
set( FYPP ${FCKIT_VENV_EXE} -m fypp )
elseif( fckit_FOUND )
# This is only needed for building in environments with python3 older than 3.8
list( APPEND _fckit_fypp_path "${FYPP}" )
list( LENGTH _fckit_fypp_path _list_length )
MATH( EXPR _last_entry "${_list_length} - 1" )
list( GET _fckit_fypp_path ${_last_entry} FYPP )
elseif( FYPP MATCHES FYPP-NOTFOUND )
include(cmake/field_api_fetchcontent_fypp.cmake)
set(FYPP ${fypp_SOURCE_DIR}/bin/fypp)
Expand Down

0 comments on commit ca79ee8

Please sign in to comment.