Restore fckit-eval script processing of fypp

awnawab · May 6, 2024 · 977cb4d · 977cb4d
1 parent 8c4f39a
commit 977cb4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/fckit-import.cmake.in b/cmake/fckit-import.cmake.in
@@ -9,12 +9,14 @@
 if( @PROJECT_NAME@_IS_BUILD_DIR_EXPORT )
   set( FCTEST_GENERATOR @Python3_EXECUTABLE@ @CMAKE_CURRENT_SOURCE_DIR@/tools/fctest-generate-runner.py )
   set( FCKIT_VENV_EXE @FCKIT_VENV_EXE@ )
+  set( _fckit_eval_script @CMAKE_CURRENT_SOURCE_DIR@/tools/fckit-eval.sh )
 else()
   set( FCTEST_GENERATOR @Python3_EXECUTABLE@ ${fckit_BASE_DIR}/libexec/fctest-generate-runner.py )
   set( FCKIT_VENV_EXE ${fckit_BASE_DIR}/@rel_venv_exe_path@ )
+  set( _fckit_eval_script ${fckit_BASE_DIR}/libexec/fckit-eval.sh )
 endif()
 
-set( FYPP ${FCKIT_VENV_EXE} -m fypp )
+set( FYPP ${_fckit_eval_script} ${FCKIT_VENV_EXE} -m fypp )
 
 @FCKIT_PREPROCESS_FYPP@
 

diff --git a/cmake/fckit_install_venv.cmake b/cmake/fckit_install_venv.cmake
@@ -62,7 +62,7 @@ macro( fckit_install_venv )
     # compute relative path to venv to aid with installation
     cmake_path( RELATIVE_PATH FCKIT_VENV_EXE BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} OUTPUT_VARIABLE rel_venv_exe_path )
 
-    set( FYPP ${FCKIT_VENV_EXE} -m fypp )
+    set( FYPP ${CMAKE_CURRENT_SOURCE_DIR}/tools/fckit-eval.sh ${FCKIT_VENV_EXE} -m fypp )
 
     # reset Python3_EXECUTABLE to the system install
     set( Python3_EXECUTABLE ${Python3_EXECUTABLE_CACHE} )