Index: Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
===================================================================
--- Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
+++ Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
@@ -6,7 +6,10 @@
 test_img_input(rgb 0.1 10)
 test_img_input(rgba 0.1 10)
 
-llvm_multisource(halide_bilateral_grid)
+llvm_multisource(halide_bilateral_grid
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${bcsources}
+)
 
 
 
Index: Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
===================================================================
--- Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
+++ Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
@@ -3,5 +3,7 @@
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
 
-llvm_multisource(halide_blur)
-
+llvm_multisource(halide_blur
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${bcsources}
+)
Index: Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
===================================================================
--- Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
+++ Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
@@ -6,8 +6,7 @@
 test_img_input(rgb 8 1 1 10)
 test_img_input(rgba 8 1 1 10)
 
-llvm_multisource(halide_local_laplacian)
-
-
-
-
+llvm_multisource(halide_local_laplacian
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${bcsources}
+)
Index: Bitcode/Regression/fft/CMakeLists.txt
===================================================================
--- Bitcode/Regression/fft/CMakeLists.txt
+++ Bitcode/Regression/fft/CMakeLists.txt
@@ -9,7 +9,9 @@
   list(APPEND LDFLAGS -l${lib})
 endforeach()
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
-llvm_multisource(fft)
-
-
+#set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
+llvm_multisource(fft
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc 
+  ${uosources}
+)
Index: Bitcode/Regression/vector_widen/CMakeLists.txt
===================================================================
--- Bitcode/Regression/vector_widen/CMakeLists.txt
+++ Bitcode/Regression/vector_widen/CMakeLists.txt
@@ -7,7 +7,9 @@
   list(APPEND LDFLAGS -l${lib})
 endforeach()
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
-llvm_multisource(widen_bug)
-
-
+#set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
+llvm_multisource(widen_bug
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc 
+  ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc
+)
Index: Bitcode/simd_ops/CMakeLists.txt
===================================================================
--- Bitcode/simd_ops/CMakeLists.txt
+++ Bitcode/simd_ops/CMakeLists.txt
@@ -19,7 +19,13 @@
   string(REGEX REPLACE ".[cp]+$" "" pathbc ${sourcebc})
   string(REGEX REPLACE ".*/" "" namebc ${pathbc})
   string(REPLACE "." "" namebc ${namebc})
-  set(Source ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc)
-  llvm_multisource(simd_ops_${namebc})
-  target_link_libraries(${PROG} simd_ops)
+#  set(Source ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc)
+#  llvm_multisource(simd_ops_${namebc})
+llvm_multisource(simd_ops_${namebc}
+  ${CMAKE_CURRENT_SOURCE_DIR}/simd_ops.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc 
+  ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc 
+  ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc
+) 
+target_link_libraries(${PROG} simd_ops)
 endforeach()