From d72a331ab141cbfe1999be280b00e4022704f5f6 Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Fri, 30 Oct 2020 21:21:28 +0100
Subject: [PATCH] fix wrong/misleading error message if pystencils/lbmpy is
missing; check for jinja2
---
CMakeLists.txt | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1abce0760..7dfde4d62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -556,14 +556,23 @@ endif ( )
##
#############################################################################################################################
if ( WALBERLA_BUILD_WITH_CODEGEN )
- find_package( PythonInterp 3 QUIET REQUIRED)
+ find_package( PythonInterp 3 QUIET REQUIRED)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import lbmpy"
+ RESULT_VARIABLE LBMPY_FOUND )
+ if(NOT LBMPY_FOUND EQUAL 0)
+ message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated but pystencils or lbmpy package not found.
+ Please install lbmpy e.g.: 'pip3 install lbmpy'")
+ endif()
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from pystencils.include import get_pystencils_include_path; print(get_pystencils_include_path())"
- RESULT_VARIABLE PYTHON_RET_CODE
OUTPUT_VARIABLE PYSTENCILS_INCLUDE_PATH)
- if(NOT PYTHON_RET_CODE EQUAL 0)
- message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated and pystencils_walberla package not found")
- endif()
include_directories( ${PYSTENCILS_INCLUDE_PATH} )
+
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import jinja2"
+ RESULT_VARIABLE JINJA2_FOUND )
+ if(NOT JINJA2_FOUND EQUAL 0)
+ message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated and jinja2 package not found.
+ Please install jinja2 e.g.: 'pip3 install jinja2'")
+ endif()
endif()
############################################################################################################################
--
GitLab