Changed to only compile a wasm target cpp file and require multiple cpp files...

Changed to only compile a wasm target cpp file and require multiple cpp files for a target be included in the target cpp file.

CMakeModules/wasm.cmake

@@ -58,10 +58,12 @@ if( NOT ("${WASM_CLANG}" STREQUAL "" OR "${WASM_LLC}" STREQUAL "" OR "${WASM_LLV
   set(WASM_TOOLCHAIN TRUE)
 endif()
 
-macro(add_wast_target target SOURCE_FILES INCLUDE_FOLDERS DESTINATION_FOLDER)
+macro(add_wast_target target INCLUDE_FOLDERS DESTINATION_FOLDER)
 
-  set(outfiles "")
-  foreach(srcfile ${SOURCE_FILES})
+  # NOTE: Setting SOURCE_FILE and looping over it to avoid cmake issue with compilation ${target}.bc's rule colliding with
+  # linking ${target}.bc's rule 
+  set(SOURCE_FILE ${target}.cpp)
+  foreach(srcfile ${SOURCE_FILE})
     
     get_filename_component(outfile ${srcfile} NAME)
     get_filename_component(infile ${srcfile} ABSOLUTE)

contracts/currency/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
 file(GLOB ABI_FILES "*.abi")
-add_wast_target(currency "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(currency "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
\ No newline at end of file

contracts/exchange/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
 file(GLOB ABI_FILES "*.abi")
-add_wast_target(exchange "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(exchange "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 add_dependencies( exchange currency )

contracts/infinite/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
-add_wast_target(infinite "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(infinite "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})

contracts/proxy/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
 file(GLOB ABI_FILES "*.abi")
-add_wast_target(proxy "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(proxy "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

contracts/simpledb/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
 file(GLOB ABI_FILES "*.abi")
-add_wast_target(simpledb "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(simpledb "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

contracts/social/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
-add_wast_target(social "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
+add_wast_target(social "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file

contracts/storage/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
 file(GLOB ABI_FILES "*.abi")
-add_wast_target(storage "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(storage "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
 configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

contracts/test_api/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
-add_wast_target(test_api "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(test_api "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})

tests/api_tests/extended_memory_test/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
-add_wast_target(extended_memory_test "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(extended_memory_test "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})

tests/api_tests/memory_test/CMakeLists.txt

-file(GLOB SOURCE_FILES "*.cpp")
-add_wast_target(memory_test "${SOURCE_FILES}" "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})
+add_wast_target(memory_test "${CMAKE_SOURCE_DIR}/contracts" ${CMAKE_CURRENT_BINARY_DIR})