diff --git a/test/eoftest/CMakeLists.txt b/test/eoftest/CMakeLists.txt index f4147742b5..23bf4593c4 100644 --- a/test/eoftest/CMakeLists.txt +++ b/test/eoftest/CMakeLists.txt @@ -6,7 +6,7 @@ hunter_add_package(nlohmann_json) find_package(nlohmann_json CONFIG REQUIRED) add_executable(evmone-eoftest) -target_link_libraries(evmone-eoftest PRIVATE evmone nlohmann_json::nlohmann_json GTest::gtest) +target_link_libraries(evmone-eoftest PRIVATE evmone evmone::testutils nlohmann_json::nlohmann_json GTest::gtest) target_include_directories(evmone-eoftest PRIVATE ${evmone_private_include_dir}) target_sources( evmone-eoftest PRIVATE diff --git a/test/eoftest/eoftest_runner.cpp b/test/eoftest/eoftest_runner.cpp index 64226677a0..cafc2d2d15 100644 --- a/test/eoftest/eoftest_runner.cpp +++ b/test/eoftest/eoftest_runner.cpp @@ -76,4 +76,4 @@ void run_eof_test(std::istream& input) } } -} // namespace evmone::test \ No newline at end of file +} // namespace evmone::test diff --git a/test/statetest/CMakeLists.txt b/test/statetest/CMakeLists.txt index 7b2ea11f95..8c29160551 100644 --- a/test/statetest/CMakeLists.txt +++ b/test/statetest/CMakeLists.txt @@ -8,7 +8,7 @@ find_package(nlohmann_json CONFIG REQUIRED) add_library(evmone-statetestutils STATIC) add_library(evmone::statetestutils ALIAS evmone-statetestutils) target_compile_features(evmone-statetestutils PUBLIC cxx_std_20) -target_link_libraries(evmone-statetestutils PRIVATE evmone::state nlohmann_json::nlohmann_json) +target_link_libraries(evmone-statetestutils PRIVATE evmone::state evmone::testutils nlohmann_json::nlohmann_json) target_include_directories(evmone-statetestutils PRIVATE ${evmone_private_include_dir}) target_sources( evmone-statetestutils PRIVATE diff --git a/test/utils/CMakeLists.txt b/test/utils/CMakeLists.txt index 12a1122895..cd27d4c44f 100644 --- a/test/utils/CMakeLists.txt +++ b/test/utils/CMakeLists.txt @@ -4,9 +4,9 @@ find_package(intx CONFIG REQUIRED) -add_library(testutils INTERFACE) +add_library(testutils STATIC) add_library(evmone::testutils ALIAS testutils) -target_link_libraries(testutils INTERFACE evmc::evmc_cpp) +target_link_libraries(testutils PUBLIC evmc::evmc_cpp) target_include_directories(testutils INTERFACE ${PROJECT_SOURCE_DIR} ${evmone_private_include_dir}) if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.19) @@ -17,3 +17,4 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.19) utils.hpp ) endif() +target_sources(testutils PRIVATE utils.cpp) diff --git a/test/utils/utils.cpp b/test/utils/utils.cpp index 846ac66455..f7524b08c1 100644 --- a/test/utils/utils.cpp +++ b/test/utils/utils.cpp @@ -42,4 +42,4 @@ evmc_revision to_rev(std::string_view s) throw std::invalid_argument{"unknown revision: " + std::string{s}}; } -} // namespace evmone::test \ No newline at end of file +} // namespace evmone::test