From e67885685a5d95ef748d515545891fb42158cf79 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Tue, 18 Jun 2024 16:19:05 +0530 Subject: [PATCH 1/3] Restoring old config file --- .../xeus-cpp/{xeus_cpp_config.hpp.in => xeus_cpp_config.hpp} | 4 ---- 1 file changed, 4 deletions(-) rename include/xeus-cpp/{xeus_cpp_config.hpp.in => xeus_cpp_config.hpp} (93%) diff --git a/include/xeus-cpp/xeus_cpp_config.hpp.in b/include/xeus-cpp/xeus_cpp_config.hpp similarity index 93% rename from include/xeus-cpp/xeus_cpp_config.hpp.in rename to include/xeus-cpp/xeus_cpp_config.hpp index d05f51ea..5dd2c3b6 100644 --- a/include/xeus-cpp/xeus_cpp_config.hpp.in +++ b/include/xeus-cpp/xeus_cpp_config.hpp @@ -13,10 +13,6 @@ #define XEUS_CPP_VERSION_MAJOR 0 #define XEUS_CPP_VERSION_MINOR 5 #define XEUS_CPP_VERSION_PATCH 0 -#define XEUS_CPP_VERSION_LABEL dev - -#define XCPP_TAGFILES_DIR "@XCPP_TAGFILES_DIR@" -#define XCPP_TAGCONFS_DIR "@XCPP_TAGCONFS_DIR@" // Composing the version string from major, minor and patch #define XEUS_CPP_CONCATENATE(A, B) XEUS_CPP_CONCATENATE_IMPL(A, B) From 0327d056c50b2dc610c5b272252a8d4256e0189d Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Tue, 18 Jun 2024 16:19:30 +0530 Subject: [PATCH 2/3] fixing cmakelists.txt --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d30fa0d..d308c8ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,6 @@ set(XCPP_TAGFILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/share/xeus-cpp/tagfiles) set(XEUS_CPP_CONF_DIR "etc/xeus-cpp") set(XCPP_TAGCONFS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/etc/xeus-cpp/tags.d) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/xeus-cpp/xeus_cpp_config.hpp.in" - "${CMAKE_CURRENT_SOURCE_DIR}/include/xeus-cpp/xeus_cpp_config.hpp") - file(COPY "${XCPP_TAGFILES_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/share/xeus-cpp") file(COPY "${XCPP_TAGCONFS_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/etc/xeus-cpp") @@ -40,14 +37,14 @@ file(COPY "${XCPP_TAGCONFS_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/etc/xe # =========== file(STRINGS "${XEUS_CPP_INCLUDE_DIR}/xeus-cpp/xeus_cpp_config.hpp" version_defines - REGEX "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH|LABEL)") + REGEX "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH)") foreach (ver ${version_defines}) - if (ver MATCHES "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH|LABEL) +([^ ]+)$") + if (ver MATCHES "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$") set(XEUS_CPP_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "") endif () endforeach () set(${PROJECT_NAME}_VERSION - ${XEUS_CPP_VERSION_MAJOR}.${XEUS_CPP_VERSION_MINOR}.${XEUS_CPP_VERSION_PATCH}${XEUS_CPP_VERSION_LABEL}) + ${XEUS_CPP_VERSION_MAJOR}.${XEUS_CPP_VERSION_MINOR}.${XEUS_CPP_VERSION_PATCH}) message(STATUS "Building xeus-cpp v${${PROJECT_NAME}_VERSION}") # Build options From 2c48d82c642147df4b9b481eeccf01ba35bb1120 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Tue, 18 Jun 2024 17:42:41 +0530 Subject: [PATCH 3/3] Use label --- CMakeLists.txt | 6 +++--- include/xeus-cpp/xeus_cpp_config.hpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d308c8ba..d75628ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,14 +37,14 @@ file(COPY "${XCPP_TAGCONFS_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/etc/xe # =========== file(STRINGS "${XEUS_CPP_INCLUDE_DIR}/xeus-cpp/xeus_cpp_config.hpp" version_defines - REGEX "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH)") + REGEX "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH|LABEL)") foreach (ver ${version_defines}) - if (ver MATCHES "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$") + if (ver MATCHES "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH|LABEL) +([^ ]+)$") set(XEUS_CPP_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "") endif () endforeach () set(${PROJECT_NAME}_VERSION - ${XEUS_CPP_VERSION_MAJOR}.${XEUS_CPP_VERSION_MINOR}.${XEUS_CPP_VERSION_PATCH}) + ${XEUS_CPP_VERSION_MAJOR}.${XEUS_CPP_VERSION_MINOR}.${XEUS_CPP_VERSION_PATCH}${XEUS_CPP_VERSION_LABEL}) message(STATUS "Building xeus-cpp v${${PROJECT_NAME}_VERSION}") # Build options diff --git a/include/xeus-cpp/xeus_cpp_config.hpp b/include/xeus-cpp/xeus_cpp_config.hpp index 5dd2c3b6..49fd01bd 100644 --- a/include/xeus-cpp/xeus_cpp_config.hpp +++ b/include/xeus-cpp/xeus_cpp_config.hpp @@ -13,6 +13,7 @@ #define XEUS_CPP_VERSION_MAJOR 0 #define XEUS_CPP_VERSION_MINOR 5 #define XEUS_CPP_VERSION_PATCH 0 +#define XEUS_CPP_VERSION_LABEL dev // Composing the version string from major, minor and patch #define XEUS_CPP_CONCATENATE(A, B) XEUS_CPP_CONCATENATE_IMPL(A, B)