From 373eb6b4faaa5f61717df3b7645ade19389eb849 Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Tue, 24 Oct 2017 12:47:55 -0500 Subject: [PATCH] Merged upstream changes to wasm.cmake. --- CMakeModules/wasm.cmake | 6 +++--- tests/api_tests/table_abi_test/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules/wasm.cmake b/CMakeModules/wasm.cmake index d60455abac5..07cd2fe0c6c 100644 --- 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 index b0d896cb918..979e6052723 100644 --- 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})