Update cmake

Author: tharun571

CMakeLists.txt

@@ -30,19 +30,22 @@ set(XCPP_TAGFILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/share/xeus-cpp/tagfiles)
 set(XEUS_CPP_CONF_DIR "etc/xeus-cpp"   CACHE STRING "xeus-cpp configuration directory")
 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")
+
 # Versionning
 # ===========
 
-file(STRINGS "VERSION" XEUS_CPP_VERSION)
-string(REPLACE "." ";" VERSION_LIST "${XEUS_CPP_VERSION}")
-string(REPLACE "\\" "" VERSION_LIST "${VERSION_LIST}")
-list(GET VERSION_LIST 0 XEUS_CPP_VERSION_MAJOR)
-list(GET VERSION_LIST 1 XEUS_CPP_VERSION_MINOR)
-list(GET VERSION_LIST 2 XEUS_CPP_VERSION_PATCH)
-
+file(STRINGS "${XEUS_CPP_INCLUDE_DIR}/xeus-cpp/xeus_cpp_config.hpp" version_defines
+     REGEX "#define XEUS_CPP_VERSION_(MAJOR|MINOR|PATCH|LABEL)")
+foreach (ver ${version_defines})
+    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})
-message(STATUS "Building xeus-cpp v${XEUS_CPP_VERSION}")
+    ${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
 # =============
@@ -171,9 +174,6 @@ message("Configure kernels: ...")
 configure_kernel("/share/jupyter/kernels/xcpp17/")
 configure_kernel("/share/jupyter/kernels/xcpp20/")
 
-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")
-
 # Source files
 # ============
 

test/test_interpreter.cpp

@@ -764,20 +764,6 @@ TEST_SUITE("xmagics_apply"){
         REQUIRE(redirect.getCaptured() == "UsageError: %%test is a cell magic, but the cell body is empty.\n"
                     "If you only intend to display %%test help, please use a double line break to fill in the cell body.\n");
     }
-    TEST_CASE("cell magic with empty cell body") {
-        xcpp::xmagics_manager manager;
-
-        std::stringstream ss;
-        auto cerr_buff = std::cerr.rdbuf();
-        std::cerr.rdbuf(ss.rdbuf());
-
-        manager.apply("test", "line", "");
-
-        std::cerr.rdbuf(cerr_buff);
-        REQUIRE(ss.str() == "UsageError: %%test is a cell magic, but the cell body is empty.\n"
-                      "If you only intend to display %%test help, please use a double line break to fill in the cell body.\n");
-
-    }
 }
 
 #if defined(__GNUC__) && !defined(XEUS_CPP_EMSCRIPTEN_WASM_BUILD)