Skip to content

Commit 277e382

Browse files
committed
Update files
1 parent 4a3ab6f commit 277e382

File tree

5 files changed

+7
-22
lines changed

5 files changed

+7
-22
lines changed

CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ set(XCPP_TAGFILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/share/xeus-cpp/tagfiles)
3030
set(XEUS_CPP_CONF_DIR "etc/xeus-cpp" CACHE STRING "xeus-cpp configuration directory")
3131
set(XCPP_TAGCONFS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/etc/xeus-cpp/tags.d)
3232

33+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/xeus-cpp/xeus_cpp_config.hpp.in"
34+
"${CMAKE_CURRENT_SOURCE_DIR}/include/xeus-cpp/xeus_cpp_config.hpp")
35+
3336
# Versionning
3437
# ===========
3538

@@ -175,10 +178,6 @@ message("Configure kernels: ...")
175178
configure_kernel("/share/jupyter/kernels/xcpp17/")
176179
configure_kernel("/share/jupyter/kernels/xcpp20/")
177180

178-
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/xeus-cpp/xeus_cpp_tags_config.hpp.in"
179-
"${CMAKE_CURRENT_SOURCE_DIR}/include/xeus-cpp/xeus_cpp_tags_config.hpp")
180-
181-
182181
# Source files
183182
# ============
184183

@@ -193,7 +192,6 @@ set(XEUS_CPP_HEADERS
193192
include/xeus-cpp/xmagics.hpp
194193
include/xeus-cpp/xoptions.hpp
195194
include/xeus-cpp/xpreamble.hpp
196-
include/xeus-cpp/xeus_cpp_tags_config.hpp
197195
#src/xdemangle.hpp
198196
#src/xinspect.hpp
199197
#src/xsystem.hpp

include/xeus-cpp/xeus_cpp_config.hpp renamed to include/xeus-cpp/xeus_cpp_config.hpp.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
#define XEUS_CPP_VERSION_MINOR 4
1515
#define XEUS_CPP_VERSION_PATCH 0
1616

17+
#define XCPP_TAGFILES_DIR "@XCPP_TAGFILES_DIR@"
18+
#define XCPP_TAGCONFS_DIR "@XCPP_TAGCONFS_DIR@"
19+
1720
// Composing the version string from major, minor and patch
1821
#define XEUS_CPP_CONCATENATE(A, B) XEUS_CPP_CONCATENATE_IMPL(A, B)
1922
#define XEUS_CPP_CONCATENATE_IMPL(A, B) A##B

include/xeus-cpp/xeus_cpp_tags_config.hpp.in

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/xinterpreter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include "xeus-cpp/xbuffer.hpp"
2424
#include "xeus-cpp/xeus_cpp_config.hpp"
25-
#include "xeus-cpp/xeus_cpp_tags_config.hpp"
2625
#include "xeus-cpp/xinterpreter.hpp"
2726
#include "xeus-cpp/xmagics.hpp"
2827

test/test_interpreter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "xeus-cpp/xmanager.hpp"
1313
#include "xeus-cpp/xutils.hpp"
1414
#include "xeus-cpp/xoptions.hpp"
15-
#include "xeus-cpp/xeus_cpp_tags_config.hpp"
15+
#include "xeus-cpp/xeus_cpp_config.hpp"
1616

1717
#include "../src/xparser.hpp"
1818
#include "../src/xsystem.hpp"

0 commit comments

Comments
 (0)