Add t8n version with cable

ethereum · Apr 14, 2023 · 68e8278 · 68e8278
1 parent 31fd534
commit 68e8278
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cmake/cable/buildinfo/buildinfo.c.in b/cmake/cable/buildinfo/buildinfo.c.in
@@ -7,7 +7,7 @@
 
 #include "buildinfo.h"
 
-const struct buildinfo* @FUNCTION_NAME@()
+const struct buildinfo* @FUNCTION_NAME@(void)
 {
     static const struct buildinfo buildinfo = {
         .project_name = "@PROJECT_NAME@",

diff --git a/cmake/cable/buildinfo/buildinfo.h.in b/cmake/cable/buildinfo/buildinfo.h.in
@@ -26,7 +26,7 @@ struct buildinfo
     const char* build_type;
 };
 
-const struct buildinfo* @FUNCTION_NAME@();
+const struct buildinfo* @FUNCTION_NAME@(void);
 
 #ifdef __cplusplus
 }

diff --git a/test/t8n/CMakeLists.txt b/test/t8n/CMakeLists.txt
@@ -2,16 +2,15 @@
 # Copyright 2022 The evmone Authors.
 # SPDX-License-Identifier: Apache-2.0
 
+include(CableBuildInfo)
+
 hunter_add_package(nlohmann_json)
 find_package(nlohmann_json CONFIG REQUIRED)
 
 add_executable(evmone-t8n)
 target_link_libraries(evmone-t8n PRIVATE evmone::statetestutils nlohmann_json::nlohmann_json)
 target_link_libraries(evmone-t8n PRIVATE evmc::evmc evmone)
+target_include_directories(evmone-t8n PRIVATE ${evmone_private_include_dir})
+cable_add_buildinfo_library(PROJECT_NAME t8n)
+target_include_directories(evmone-t8n PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 target_sources(evmone-t8n PRIVATE t8n.cpp)
-
-# Provide the project version to selected source files.
-set_source_files_properties(
-        t8n.cpp
-        PROPERTIES COMPILE_DEFINITIONS PROJECT_VERSION="${PROJECT_VERSION}"
-)
diff --git a/test/t8n/t8n.cpp b/test/t8n/t8n.cpp
@@ -6,6 +6,7 @@
 #include "../state/rlp.hpp"
 #include "../statetest/statetest.hpp"
 #include <evmone/evmone.h>
+#include <evmone_t8n/version.h>
 #include <nlohmann/json.hpp>
 #include <filesystem>
 #include <fstream>
@@ -39,7 +40,7 @@ int main(int argc, const char* argv[])
 
             if (arg == "-v")
             {
-                std::cout << "evmone-t8n " PROJECT_VERSION "\n";
+                std::cout << "evmone-t8n " EVMONE_T8N_VERSION "\n";
                 return 0;
             }
             if (arg == "--state.fork" && ++i < argc)