Downgrade minimum cmake to 3.17

awnawab · May 6, 2024 · 06f9346 · 06f9346
1 parent 10ca617
commit 06f9346
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@
 ############################################################################################
 # FCKIT
 
-cmake_minimum_required( VERSION 3.20 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.17 FATAL_ERROR )
 
 find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild )
 
@@ -114,7 +114,7 @@ endif()
 set( FCKIT_LIBRARIES  fckit )
 
 ################################################################################################
-# find and install python packages
+# install python packages
 include( fckit_install_venv )
 
 # install python venv with rumael.yaml and fypp

diff --git a/cmake/fckit_install_venv.cmake b/cmake/fckit_install_venv.cmake
@@ -12,7 +12,7 @@ macro( fckit_install_venv )
     set( Python3_FIND_VIRTUALENV STANDARD )
     find_package( Python3 COMPONENTS Interpreter REQUIRED )
 
-    # Create a loki virtualenv
+    # Create a virtualenv
     set( VENV_PATH ${CMAKE_CURRENT_BINARY_DIR}/venv )
     message( STATUS "Create Python virtual environment ${VENV_PATH}" )
     execute_process( COMMAND ${Python3_EXECUTABLE} -m venv --copies "${VENV_PATH}" )
@@ -60,7 +60,7 @@ macro( fckit_install_venv )
     set( FCKIT_VENV_EXE ${Python3_EXECUTABLE} )
 
     # 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 )
+    string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" rel_venv_exe_path ${FCKIT_VENV_EXE})
 
     set( FYPP ${CMAKE_CURRENT_SOURCE_DIR}/tools/fckit-eval.sh ${FCKIT_VENV_EXE} -m fypp )