From 08d86c8f788d0abefc02391e4929f23ea2153055 Mon Sep 17 00:00:00 2001
From: anutosh491 <andersonbhat491@gmail.com>
Date: Fri, 8 Nov 2024 19:05:35 +0530
Subject: [PATCH 1/2] Update cxx-compiler and address resource dir config

---
 CMakeLists.txt      | 9 ++++++++-
 environment-dev.yml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd777a74..ad4c9efc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,13 @@ find_package(pugixml REQUIRED)
 # Configuration
 # =============
 
+if (CPPINTEROP_LLVM_VERSION_MAJOR VERSION_GREATER ${CMAKE_CXX_COMPILER_VERSION})
+    message(WARNING "The resource directory being used corresponds to clang version ${CMAKE_CXX_COMPILER_VERSION}. \
+        It should be updated to match clang version ${CPPINTEROP_LLVM_VERSION_MAJOR} once cppinterop \
+        can provide a compatible resource directory.")
+endif()
+string(REGEX MATCH "^([0-9]+)" CXX_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+
 if (NOT DEFINED XEUS_CPP_KERNELSPEC_PATH)
     set(XEUS_CPP_KERNELSPEC_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/")
 endif ()
@@ -119,7 +126,7 @@ endif ()
 function(configure_kernel kernel)
   set(XEUS_CPP_PATH "$ENV{PATH}")
   set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
-  set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR})
+  set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CXX_MAJOR_VERSION})
   set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
 
   if (WIN32)
diff --git a/environment-dev.yml b/environment-dev.yml
index 256679a9..7216cd31 100644
--- a/environment-dev.yml
+++ b/environment-dev.yml
@@ -5,7 +5,7 @@ dependencies:
   # Build dependencies
   - make
   - cmake
-  - cxx-compiler=1.7.0
+  - cxx-compiler>=1.8.0
   # Host dependencies
   - xeus>=5.0.0
   - xeus-zmq>=3.0,<4.0

From fd0e46327d6cdb691e7fdbcd2597cedc7e0781b5 Mon Sep 17 00:00:00 2001
From: Anutosh Bhat <87052487+anutosh491@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:19:18 +0530
Subject: [PATCH 2/2] debug cxx-compiler version

---
 environment-dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment-dev.yml b/environment-dev.yml
index 7216cd31..a9f2d339 100644
--- a/environment-dev.yml
+++ b/environment-dev.yml
@@ -5,7 +5,7 @@ dependencies:
   # Build dependencies
   - make
   - cmake
-  - cxx-compiler>=1.8.0
+  - cxx-compiler=1.7.0
   # Host dependencies
   - xeus>=5.0.0
   - xeus-zmq>=3.0,<4.0
@@ -21,4 +21,4 @@ dependencies:
   - nbformat
   - nbval
   - pytest-rerunfailures
-  - doctest
\ No newline at end of file
+  - doctest