diff --git a/cmake/ecwam_find_python_mods.cmake b/cmake/ecwam_find_python_mods.cmake index 32d649b3a..65db7a15d 100644 --- a/cmake/ecwam_find_python_mods.cmake +++ b/cmake/ecwam_find_python_mods.cmake @@ -11,15 +11,15 @@ macro( ecwam_find_python_mods ) set(PYYAML_FOUND OFF) # Look for fypp pre-processor - find_program( FYPP_PATH fypp QUIET) - if( FYPP_PATH ) + find_program( FYPP fypp HINTS ${fypp_ROOT} ) + if( FYPP ) ecbuild_info( "${ECWAM_PROJECT_NAME} FOUND fypp" ) set(FYPP_FOUND ON) else() ecbuild_info( "${ECWAM_PROJECT_NAME} FAILED to find optional package fypp" ) endif() # We do a QUIET ecbuild_find_package to update the ecbuild project summary - ecbuild_find_package( fypp QUIET) + ecbuild_find_package( fypp QUIET ) # Look for python interpreter and pyyaml package ecbuild_find_python() diff --git a/src/ecwam/CMakeLists.txt b/src/ecwam/CMakeLists.txt index 3aefbc14d..4954a8eb9 100644 --- a/src/ecwam/CMakeLists.txt +++ b/src/ecwam/CMakeLists.txt @@ -357,7 +357,7 @@ if( HAVE_GEN_DERIV_TYPES ) list( APPEND ecwam_srcs ${CMAKE_CURRENT_BINARY_DIR}/yowfield_mod.F90) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yowfield_mod.F90 - COMMAND fypp -m io -m yaml -m os -DMIXED_PRECISION=${MIXED_PRECISION} ${CMAKE_CURRENT_SOURCE_DIR}/yowfield_mod.fypp > yowfield_mod.F90 + COMMAND ${FYPP} -m io -m yaml -m os -DMIXED_PRECISION=${MIXED_PRECISION} ${CMAKE_CURRENT_SOURCE_DIR}/yowfield_mod.fypp > yowfield_mod.F90 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/yowfield_mod.fypp VERBATIM) else()