Merged upstream changes to wasm.cmake.

EOSIO · Oct 24, 2017 · 373eb6b · 373eb6b · 8613354273659 · Nov 1, 2017
1 parent 0916f35
commit 373eb6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeModules/wasm.cmake b/CMakeModules/wasm.cmake
@@ -161,7 +161,7 @@ macro(add_wast_target target INCLUDE_FOLDERS DESTINATION_FOLDER)
 
 endmacro(add_wast_target)
 
-function(add_wast_abi_target target SOURCE_FILES INCLUDE_FOLDERS SOURCE_FOLDER DESTINATION_FOLDER)
+function(add_wast_abi_target target INCLUDE_FOLDERS SOURCE_FOLDER DESTINATION_FOLDER)
   add_custom_command(OUTPUT ${DESTINATION_FOLDER}/${target}.abi.hpp
     DEPENDS ${SOURCE_FOLDER}/${target}.abi
     COMMAND echo "const char* ${target}_abi = R\"=====("  > ${DESTINATION_FOLDER}/${target}.abi.hpp
@@ -172,5 +172,5 @@ function(add_wast_abi_target target SOURCE_FILES INCLUDE_FOLDERS SOURCE_FOLDER D
   )
   set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${target}.abi.hpp)
   set(extra_target_dependency   ${DESTINATION_FOLDER}/${target}.abi.hpp)
-  add_wast_target(${target} "${SOURCE_FILES}" "${INCLUDE_FOLDERS}" ${CMAKE_CURRENT_BINARY_DIR})
-endfunction(add_abi_dependency)
+  add_wast_target(${target} "${INCLUDE_FOLDERS}" ${CMAKE_CURRENT_BINARY_DIR})
+endfunction(add_wast_abi_target)
diff --git a/tests/api_tests/table_abi_test/CMakeLists.txt b/tests/api_tests/table_abi_test/CMakeLists.txt
@@ -1,2 +1,2 @@
 file(GLOB SOURCE_FILES "*.cpp")
-add_wast_abi_target(table_abi_test "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_abi_target(table_abi_test "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})