Order matters for EosioTester linked libraries.

Some cleanup as well.
AntelopeIO · Sep 15, 2023 · b1addd9 · b1addd9
1 parent 64e414f
commit b1addd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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} )