File tree 2 files changed +9
-2
lines changed
2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -112,14 +112,21 @@ find_package(pugixml REQUIRED)
112
112
# Configuration
113
113
# =============
114
114
115
+ if (CPPINTEROP_LLVM_VERSION_MAJOR VERSION_GREATER ${CMAKE_CXX_COMPILER_VERSION} )
116
+ message (WARNING "The resource directory being used corresponds to clang version ${CMAKE_CXX_COMPILER_VERSION} . \
117
+ It should be updated to match clang version ${CPPINTEROP_LLVM_VERSION_MAJOR} once cppinterop \
118
+ can provide a compatible resource directory." )
119
+ endif ()
120
+ string (REGEX MATCH "^([0-9]+)" CXX_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION} )
121
+
115
122
if (NOT DEFINED XEUS_CPP_KERNELSPEC_PATH)
116
123
set (XEUS_CPP_KERNELSPEC_PATH "${CMAKE_INSTALL_PREFIX} /${CMAKE_INSTALL_BINDIR} /" )
117
124
endif ()
118
125
119
126
function (configure_kernel kernel)
120
127
set (XEUS_CPP_PATH "$ENV{PATH} " )
121
128
set (XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH} " )
122
- set (XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX} /${CMAKE_INSTALL_LIBDIR} /clang/${CPPINTEROP_LLVM_VERSION_MAJOR } )
129
+ set (XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX} /${CMAKE_INSTALL_LIBDIR} /clang/${CXX_MAJOR_VERSION } )
123
130
set (XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX} /include )
124
131
125
132
if (WIN32 )
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ dependencies:
5
5
# Build dependencies
6
6
- make
7
7
- cmake
8
- - cxx-compiler=1.7 .0
8
+ - cxx-compiler> =1.8 .0
9
9
# Host dependencies
10
10
- xeus>=5.0.0
11
11
- xeus-zmq>=3.0,<4.0
You can’t perform that action at this time.
0 commit comments