From a5b057576d0a614f61d2b95ff924fcf53eacd6a7 Mon Sep 17 00:00:00 2001
From: Murat Keceli <keceli@gmail.com>
Date: Thu, 22 Dec 2022 13:03:25 -0600
Subject: [PATCH 1/2] Fix issue #26 and update cppyy to 2.4.1

---
 cmake/FindCppyy.cmake | 48 +++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/cmake/FindCppyy.cmake b/cmake/FindCppyy.cmake
index c6cbada8..d119243a 100644
--- a/cmake/FindCppyy.cmake
+++ b/cmake/FindCppyy.cmake
@@ -4,7 +4,7 @@
 #
 # Set minimal cppyy version
 #
-set(cppyy_version "2.4.0")
+set(cppyy_version "2.4.1")
 #
 # Make sure Python3 is installed
 #
@@ -13,34 +13,60 @@ find_package(Python3 COMPONENTS Interpreter REQUIRED)
 # Check if cppyy Python package exists
 #
 execute_process(
-    COMMAND Python3::Interpreter -c "import cppyy"
-    RESULT_VARIABLE _fcppyy_result
+    COMMAND ${Python3_EXECUTABLE} -c "import cppyy"
+    OUTPUT_VARIABLE _fcppyy_result
 )
 #
 # If cppyy exists, check version
 #
 if("${_fcppyy_result}" STREQUAL "")
+    set(Cppyy_FOUND TRUE)
     execute_process(
-        COMMAND Python3::Interpreter -c "import cppyy; print(cppyy.__version__)"
-        RESULT_VARIABLE _fcppyy_result2
+        COMMAND ${Python3_EXECUTABLE} -c "import cppyy; print(cppyy.__version__),"
+        OUTPUT_VARIABLE _fcppyy_result2
     )
+else()
+    set(Cppyy_FOUND FALSE)
 endif()
 #
 # Try to install cppyy Python package, if it doesn't exist or is incorrect version
 #
-if(NOT "${_fcppyy_result}" STREQUAL "" OR NOT "${_fcppyy_result2}" STREQUAL "${cppyy_version}")
+if("${_fcppyy_result}" STREQUAL "" OR NOT "${_fcppyy_result2}" VERSION_EQUAL "${cppyy_version}")
     if(DEFINED ENV{VIRTUAL_ENV} OR DEFINED ENV{CONDA_PREFIX})
-      set(_pip_args)
+        set(_pip_args)
     else()
-      set(_pip_args "--user")
+        set(_pip_args "--user")
     endif()
     set(_pypkg_name "cppyy==${cppyy_version}")
     execute_process(COMMAND ${Python3_EXECUTABLE} -m pip install ${_pypkg_name} ${_pip_args})
     #
     # Check again if cppyy Python works
     #
-    execute_process(COMMAND Python3::Interpreter -c "import cppyy" RESULT_VARIABLE _fcppyy_result)
-    if(NOT "${_fcppyy_result}" STREQUAL "")
-       set(Cppyy_FOUND FALSE)
+    execute_process(COMMAND ${Python3_EXECUTABLE} -c "import cppyy" OUTPUT_VARIABLE _fcppyy_result)
+    if("${_fcppyy_result}" STREQUAL "")
+        set(Cppyy_FOUND TRUE)
+    	execute_process(
+            COMMAND ${Python3_EXECUTABLE} -c "import cppyy; print(cppyy.__version__),"
+        	OUTPUT_VARIABLE _fcppyy_result2
+    	)
+    else()
+        set(Cppyy_FOUND FALSE)
+    endif()
+    #
+    # Check the version again
+    #
+    if("${_fcppyy_result2}" VERSION_EQUAL "${cppyy_version}")
+        set(Cppyy_FOUND TRUE)
+    else()
+        set(Cppyy_FOUND FALSE)
     endif()
+else()
+    set(Cppyy_FOUND TRUE)
+endif()
+
+if(NOT Cppyy_FOUND)
+    message("Python3: ${Python3_EXECUTABLE}")
+    message("import output: ${_fcppyy_result}")
+    message("version output: ${_fcppyy_result2}")
+    message(FATAL_ERROR "CMake could not install cppyy, try installing cppyy ${cppyy_version} manually.")
 endif()

From ebbd7cd4d42ab1dec2be5489659b6f1fdf0fa77a Mon Sep 17 00:00:00 2001
From: Murat Keceli <keceli@gmail.com>
Date: Thu, 22 Dec 2022 13:05:15 -0600
Subject: [PATCH 2/2] Disable including implicit directories

which triggers problems with IntelLLVM
---
 cmake/nwx_python_mods.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/nwx_python_mods.cmake b/cmake/nwx_python_mods.cmake
index ece60ad3..d043ebf4 100644
--- a/cmake/nwx_python_mods.cmake
+++ b/cmake/nwx_python_mods.cmake
@@ -46,7 +46,6 @@ function(cppyy_make_python_package)
     #---------------------------------------------------------------------------
     get_true_target_property(include_dirs ${install_data_PACKAGE} INTERFACE_INCLUDE_DIRECTORIES)
     list(APPEND include_dirs ${MPI_CXX_HEADER_DIR})
-    list(APPEND include_dirs ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
     list(REMOVE_DUPLICATES include_dirs)
     #---------------------------------------------------------------------------
     #--------------------------Get headers to include---------------------------