From 24a941b9713b38c35896c630f98865ab28d01e67 Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Wed, 18 Jun 2025 08:43:27 +0000 Subject: [PATCH 1/3] Add BUILD_SITE into fckit app --- src/apps/fckit.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/apps/fckit.in b/src/apps/fckit.in index bbdf4e5..f154f2e 100755 --- a/src/apps/fckit.in +++ b/src/apps/fckit.in @@ -43,6 +43,7 @@ info() echo "Build:" echo " build type : @CMAKE_BUILD_TYPE@" echo " timestamp : @EC_BUILD_TIMESTAMP@" + echo " build site : @BUILD_SITE@" echo " op. system : @CMAKE_SYSTEM@ (@EC_OS_NAME@.@EC_OS_BITS@)" echo " processor : @CMAKE_SYSTEM_PROCESSOR@" echo " sources : @PROJECT_SOURCE_DIR@" From ced6bf030675ab9a7f1001920ce6c6ef6f12e724 Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Wed, 18 Jun 2025 08:43:38 +0000 Subject: [PATCH 2/3] debugging --- CMakeLists.txt | 11 +++++++++++ cmake/fckit-import.cmake.in | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91554bc..e12c808 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,6 +122,8 @@ set( install_permissions OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_E set( Python3_FIND_VIRTUALENV STANDARD ) find_package( Python3 COMPONENTS Interpreter ) +ecbuild_warn_var(Python3_EXECUTABLE) + ecbuild_add_option( FEATURE FCKIT_VENV DEFAULT OFF DESCRIPTION "Install Python virtual environment with fypp and a yaml parser" @@ -142,6 +144,9 @@ endif() # sources set( FCTEST_GENERATOR ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/fctest-generate-runner.py ) + +ecbuild_warn_var( FCTEST_GENERATOR ) + include( fckit_preprocess_fypp ) include( add_fctest ) @@ -169,4 +174,10 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/fckit_preprocess_fypp.cmake FCKIT_PR install( FILES tools/fctest-generate-runner.py DESTINATION libexec PERMISSIONS ${install_permissions} ) install( FILES tools/fckit-eval.sh DESTINATION libexec PERMISSIONS ${install_permissions} ) +ecbuild_warn_var(Python3_EXECUTABLE) + ecbuild_install_project( NAME fckit ) + +file(READ ${CMAKE_BINARY_DIR}/fckit-import.cmake FCKIT_IMPORT_CONTENT) +ecbuild_warn_var(FCKIT_IMPORT_CONTENT) + diff --git a/cmake/fckit-import.cmake.in b/cmake/fckit-import.cmake.in index 11a8538..2ad330c 100644 --- a/cmake/fckit-import.cmake.in +++ b/cmake/fckit-import.cmake.in @@ -46,3 +46,9 @@ if( fckit_FIND_REQUIRED_ECKIT AND NOT fckit_ECKIT_FOUND ) endif() set( FCKIT_LIBRARIES @FCKIT_LIBRARIES@ ) + +ecbcuild_warn_var(FCTEST_GENERATOR) + +set( FCKIT_BUILD_SITE @BUILD_SITE@ ) +ecbuild_warn_var( FCKIT_BUILD_SITE ) +ecbuild_warn_var( BUILD_SITE ) From ee2db99e8cac7108c3c11ffd9d140514515eabcb Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Wed, 18 Jun 2025 08:50:10 +0000 Subject: [PATCH 3/3] fixup --- cmake/fckit-import.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/fckit-import.cmake.in b/cmake/fckit-import.cmake.in index 2ad330c..defa301 100644 --- a/cmake/fckit-import.cmake.in +++ b/cmake/fckit-import.cmake.in @@ -47,7 +47,7 @@ endif() set( FCKIT_LIBRARIES @FCKIT_LIBRARIES@ ) -ecbcuild_warn_var(FCTEST_GENERATOR) +ecbuild_warn_var(FCTEST_GENERATOR) set( FCKIT_BUILD_SITE @BUILD_SITE@ ) ecbuild_warn_var( FCKIT_BUILD_SITE )