File tree Expand file tree Collapse file tree 2 files changed +11
-13
lines changed Expand file tree Collapse file tree 2 files changed +11
-13
lines changed Original file line number Diff line number Diff line change @@ -30,19 +30,14 @@ set(XCPP_TAGFILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/share/xeus-cpp/tagfiles)
30
30
set (XEUS_CPP_CONF_DIR "etc/xeus-cpp" CACHE STRING "xeus-cpp configuration directory" )
31
31
set (XCPP_TAGCONFS_DIR ${CMAKE_CURRENT_SOURCE_DIR} /etc/xeus-cpp/tags.d )
32
32
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
-
36
33
# Versionning
37
34
# ===========
38
35
39
- file (STRINGS "${XEUS_CPP_INCLUDE_DIR} /xeus-cpp/xeus_cpp_config.hpp" version_defines
40
- REGEX "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH)" )
41
- foreach (ver ${version_defines} )
42
- if (ver MATCHES "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$" )
43
- set (XEUS_CPP_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2} " CACHE INTERNAL "" )
44
- endif ()
45
- endforeach ()
36
+ # Set the version
37
+ set (XEUS_CPP_VERSION_MAJOR 0 )
38
+ set (XEUS_CPP_VERSION_MINOR 4 )
39
+ set (XEUS_CPP_VERSION_PATCH 0 )
40
+
46
41
set (${PROJECT_NAME} _VERSION
47
42
${XEUS_CPP_VERSION_MAJOR} .${XEUS_CPP_VERSION_MINOR}.${XEUS_CPP_VERSION_PATCH} )
48
43
message (STATUS "Building xeus-cpp v${${PROJECT_NAME} _VERSION}" )
@@ -178,6 +173,9 @@ message("Configure kernels: ...")
178
173
configure_kernel ("/share/jupyter/kernels/xcpp17/" )
179
174
configure_kernel ("/share/jupyter/kernels/xcpp20/" )
180
175
176
+ configure_file ("${CMAKE_CURRENT_SOURCE_DIR} /include/xeus-cpp/xeus_cpp_config.hpp.in"
177
+ "${CMAKE_CURRENT_SOURCE_DIR} /include/xeus-cpp/xeus_cpp_config.hpp" )
178
+
181
179
# Source files
182
180
# ============
183
181
Original file line number Diff line number Diff line change 10
10
#define XEUS_CPP_CONFIG_HPP
11
11
12
12
// Project version
13
- #define XEUS_CPP_VERSION_MAJOR 0
14
- #define XEUS_CPP_VERSION_MINOR 4
15
- #define XEUS_CPP_VERSION_PATCH 0
13
+ #define XEUS_CPP_VERSION_MAJOR @XEUS_CPP_VERSION_MAJOR@
14
+ #define XEUS_CPP_VERSION_MINOR @XEUS_CPP_VERSION_MINOR@
15
+ #define XEUS_CPP_VERSION_PATCH @XEUS_CPP_VERSION_PATCH@
16
16
17
17
#define XCPP_TAGFILES_DIR "@XCPP_TAGFILES_DIR@"
18
18
#define XCPP_TAGCONFS_DIR "@XCPP_TAGCONFS_DIR@"
You can’t perform that action at this time.
0 commit comments