From b1addd9b94e5173f9a1ec2fb50481e3e1f13a08c Mon Sep 17 00:00:00 2001 From: Peter Oschwald Date: Fri, 15 Sep 2023 15:11:59 -0500 Subject: [PATCH] Order matters for EosioTester linked libraries. Some cleanup as well. --- CMakeModules/EosioTester.cmake.in | 2 +- CMakeModules/EosioTesterBuild.cmake.in | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in index 3f24011387..8c4a5ed566 100644 --- a/CMakeModules/EosioTester.cmake.in +++ b/CMakeModules/EosioTester.cmake.in @@ -120,9 +120,9 @@ endif() add_library(EosioTester INTERFACE) target_link_libraries(EosioTester INTERFACE - EosioChain ${libtester} Boost::unit_test_framework + EosioChain ) macro(add_eosio_test_executable test_name) diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in index d33a0825f3..5444d7c9a1 100644 --- a/CMakeModules/EosioTesterBuild.cmake.in +++ b/CMakeModules/EosioTesterBuild.cmake.in @@ -110,8 +110,7 @@ target_include_directories(EosioChain INTERFACE @CMAKE_SOURCE_DIR@/libraries/softfloat/source/include @CMAKE_SOURCE_DIR@/libraries/appbase/include @CMAKE_SOURCE_DIR@/libraries/chainbase/include - @CMAKE_SOURCE_DIR@/libraries/testing/include - @CMAKE_SOURCE_DIR@/libraries/wasm-jit/Include ) + @CMAKE_SOURCE_DIR@/libraries/wasm-jit/include ) #adds -ltr. Ubuntu eosio.contracts build breaks without this @@ -122,13 +121,13 @@ endif() add_library(EosioTester INTERFACE) target_link_libraries(EosioTester INTERFACE - EosioChain ${libtester} Boost::unit_test_framework + EosioChain ) target_include_directories(EosioTester INTERFACE - @CMAKE_SOURCE_DIR@/libraries/testing/Include ) + @CMAKE_SOURCE_DIR@/libraries/testing/include ) macro(add_eosio_test_executable test_name) add_executable( ${test_name} ${ARGN} )