diff --git a/CMakeModules/wasm.cmake b/CMakeModules/wasm.cmake
index 658c8820fa1c1e6d3eaef62f2aaf850db30666de..5109cce70ed2ac27dc48c93fa765cd9c886f1d92 100644
--- a/CMakeModules/wasm.cmake
+++ b/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)
diff --git a/contracts/currency/CMakeLists.txt b/contracts/currency/CMakeLists.txt
index 25a05ec39e7959653b3f432d0a81fe9e9cc8824e..d8a2f2b371df159052f09a501fbd05c67c95fd4b 100644
--- a/contracts/currency/CMakeLists.txt
+++ b/contracts/currency/CMakeLists.txt
@@ -1,4 +1,3 @@
-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
diff --git a/contracts/exchange/CMakeLists.txt b/contracts/exchange/CMakeLists.txt
index b24d1a1756a683fd9cc2448e1bf73242020a8e30..2abac50cd86904fc8f473ffea9805e400a95dba6 100644
--- a/contracts/exchange/CMakeLists.txt
+++ b/contracts/exchange/CMakeLists.txt
@@ -1,5 +1,4 @@
-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 )
diff --git a/contracts/infinite/CMakeLists.txt b/contracts/infinite/CMakeLists.txt
index 4c3750b90344848ce35f72cea77568a87b7c61ba..3285a93d1de2e51fd9956156449c23297eabdd8b 100644
--- a/contracts/infinite/CMakeLists.txt
+++ b/contracts/infinite/CMakeLists.txt
@@ -1,2 +1 @@
-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})
diff --git a/contracts/proxy/CMakeLists.txt b/contracts/proxy/CMakeLists.txt
index 08b61b9a4cfa57d4313b836599e694a9f3e7ad0e..9e96cc08ec49dfae41d0ae83d5ba33f2d709a9b6 100644
--- a/contracts/proxy/CMakeLists.txt
+++ b/contracts/proxy/CMakeLists.txt
@@ -1,4 +1,3 @@
-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)
diff --git a/contracts/simpledb/CMakeLists.txt b/contracts/simpledb/CMakeLists.txt
index c956a39a1d06481e2155c903016ef6257d0ed8c5..e1adb97ab5294a9dd10be4d2a24bcf5f57f5327e 100644
--- a/contracts/simpledb/CMakeLists.txt
+++ b/contracts/simpledb/CMakeLists.txt
@@ -1,4 +1,3 @@
-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)
diff --git a/contracts/social/CMakeLists.txt b/contracts/social/CMakeLists.txt
index f854bffb117727ac2b83a3ee988539da583c111b..35b64147f3f902772567cd00ea65a647164e8c5a 100644
--- a/contracts/social/CMakeLists.txt
+++ b/contracts/social/CMakeLists.txt
@@ -1,2 +1 @@
-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
diff --git a/contracts/storage/CMakeLists.txt b/contracts/storage/CMakeLists.txt
index ec026d95a5921c6c852f054286821365e78a86c3..86518cce4c366cd3216af2503a4e1f5a3fed8cdf 100644
--- a/contracts/storage/CMakeLists.txt
+++ b/contracts/storage/CMakeLists.txt
@@ -1,4 +1,3 @@
-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)
diff --git a/contracts/test_api/CMakeLists.txt b/contracts/test_api/CMakeLists.txt
index c16bf13c81d1f24c2f13a8e1a717c1a70ccc4261..3bff6d6623efbd19129ee2b2c22e44efe1eb9748 100644
--- a/contracts/test_api/CMakeLists.txt
+++ b/contracts/test_api/CMakeLists.txt
@@ -1,2 +1 @@
-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})
diff --git a/tests/api_tests/extended_memory_test/CMakeLists.txt b/tests/api_tests/extended_memory_test/CMakeLists.txt
index 87a30f7eed397379caa2960e44f8e14117c480a4..32903770b4ee079cd17ab994bae04e638289d8c7 100644
--- a/tests/api_tests/extended_memory_test/CMakeLists.txt
+++ b/tests/api_tests/extended_memory_test/CMakeLists.txt
@@ -1,2 +1 @@
-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})
diff --git a/tests/api_tests/memory_test/CMakeLists.txt b/tests/api_tests/memory_test/CMakeLists.txt
index a641b341bd907c71e20a9c34491b5d376940239b..f21ef0989649c2a50d29c00d12f17c7d6fb7175d 100644
--- a/tests/api_tests/memory_test/CMakeLists.txt
+++ b/tests/api_tests/memory_test/CMakeLists.txt
@@ -1,2 +1 @@
-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})