From 1d8402c010e49086d83582a384927d51a7783946 Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Fri, 30 Oct 2020 07:42:24 +0100
Subject: [PATCH 1/3] fix missleading naming in error message; check for jinja2

---
 CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1abce0760..c7db6a273 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -561,7 +561,13 @@ if ( WALBERLA_BUILD_WITH_CODEGEN )
                     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")
+        message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated and pystencils package not found")
+    endif()
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import jinja2"
+          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 jinja2 package not found")
     endif()
     include_directories( ${PYSTENCILS_INCLUDE_PATH} )
 endif()
-- 
GitLab


From d19218383acca6d3e0e5ada16940f9dd04f5cec5 Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Fri, 30 Oct 2020 07:48:11 +0100
Subject: [PATCH 2/3] fix bug

---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7db6a273..6c72db952 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -563,13 +563,12 @@ if ( WALBERLA_BUILD_WITH_CODEGEN )
     if(NOT PYTHON_RET_CODE EQUAL 0)
         message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated and pystencils package not found")
     endif()
+    include_directories( ${PYSTENCILS_INCLUDE_PATH} )
     execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import jinja2"
-          RESULT_VARIABLE PYTHON_RET_CODE
-          OUTPUT_VARIABLE PYSTENCILS_INCLUDE_PATH)
+          RESULT_VARIABLE PYTHON_RET_CODE )
     if(NOT PYTHON_RET_CODE EQUAL 0)
        message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated and jinja2 package not found")
     endif()
-    include_directories( ${PYSTENCILS_INCLUDE_PATH} )
 endif()
 ############################################################################################################################
 
-- 
GitLab


From 62dcc6124e932f89bd9f7a3068145fd86273128b Mon Sep 17 00:00:00 2001
From: Dominik Thoennes <dominik.thoennes@fau.de>
Date: Fri, 30 Oct 2020 10:27:50 +0100
Subject: [PATCH 3/3] check for lbmpy instead of pystencils

---
 CMakeLists.txt | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c72db952..7dfde4d62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -556,18 +556,22 @@ 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 package not found")
-    endif()
     include_directories( ${PYSTENCILS_INCLUDE_PATH} )
+
     execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import jinja2"
-          RESULT_VARIABLE PYTHON_RET_CODE )
-    if(NOT PYTHON_RET_CODE EQUAL 0)
-       message(FATAL_ERROR "WALBERLA_BUILD_WITH_CODEGEN activated and jinja2 package not found")
+          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