Fixed CMake for memory_test wasm outside of contracts.

EOSIO · Sep 11, 2017 · a3dce48 · a3dce48
1 parent 179975b
commit a3dce48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -15,8 +15,8 @@ if(WASM_TOOLCHAIN)
   file(GLOB SLOW_TESTS "slow_tests/*.cpp")
   add_executable( slow_test ${SLOW_TESTS} ${COMMON_SOURCES} )
   target_link_libraries( slow_test eos_native_contract eos_chain chainbase eos_utilities eos_egenesis_none fc ${PLATFORM_SPECIFIC_LIBS} )
-  target_include_directories( slow_test PUBLIC ${CMAKE_BINARY_DIR}/contracts )
-  add_dependencies(slow_test currency exchange)
+  target_include_directories( slow_test PUBLIC ${CMAKE_BINARY_DIR}/contracts ${CMAKE_CURRENT_BINARY_DIR}/slow_tests )
+  add_dependencies(slow_test currency exchange memory_test)
 
   file(GLOB API_TESTS "api_tests/*.cpp")
   add_executable( api_test ${API_TESTS} ${COMMON_SOURCES} )

diff --git a/tests/slow_tests/memory_test/CMakeLists.txt b/tests/slow_tests/memory_test/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB SOURCE_FILES "*.cpp")
-add_wast_target(memory_test "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_SOURCE_DIR})
+add_wast_target(memory_test "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})