Skip to content

Commit b9c487d

Browse files
authored
Revert cppinterop update to 1.8.0 temporarily (#445)
* Revert cppinterop update to 1.8.0 temporarily
1 parent e4d9389 commit b9c487d

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ endif()
9292

9393
set(xeus_REQUIRED_VERSION 5.0.0)
9494
set(xeus_zmq_REQUIRED_VERSION 3.0.0)
95-
set(CppInterOp_REQUIRED_VERSION 1.8.0)
95+
set(CppInterOp_REQUIRED_VERSION 1.7.0)
9696
set(xeus_lite_REQUIRED_VERSION 3.2.1)
9797

9898
if (NOT TARGET xeus AND NOT TARGET xeus-static)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ http://xeus-cpp.readthedocs.io
207207

208208
| `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` |
209209
|------------|-----------------|--------------|-----------|---------------|-----------------|
210-
| main | 3.1.0 | 1.8.0 | 1.15 | 3.2 | 3.12.0 |
210+
| main | 3.1.0 | 1.7.0 | 1.15 | 3.2 | 3.12.0 |
211211

212212
## Contributing
213213

environment-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ dependencies:
55
# Build dependencies
66
- make
77
- cmake
8-
- cxx-compiler
8+
- cxx-compiler=1.7.0
99
# Host dependencies
1010
- xeus>=5.0.0
1111
- xeus-zmq<4.0
1212
- nlohmann_json
1313
- nlohmann_json-abi
14-
- CppInterOp>=1.8
14+
- CppInterOp<1.8
1515
- pugixml
1616
- cpp-argparse
1717
# Test dependencies

environment-wasm-host.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
- nlohmann_json-abi
88
- xeus-lite
99
- xeus
10-
- CppInterOp>=1.8
10+
- CppInterOp<1.8
1111
- cpp-argparse
1212
- pugixml
1313
- doctest

include/xeus-cpp/xinterpreter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <string>
1717
#include <vector>
1818

19-
#include <CppInterOp/CppInterOp.h>
19+
#include "clang/Interpreter/CppInterOp.h" // from CppInterOp package
2020

2121
#include <nlohmann/json.hpp>
2222

src/xinspect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "xinspect.hpp"
1616

17-
#include <CppInterOp/CppInterOp.h>
17+
#include "clang/Interpreter/CppInterOp.h"
1818

1919
namespace xcpp
2020
{

0 commit comments

Comments
 (0)