[test-suite] r338787 - cmake: Make benchmark name an argument of llvm_multisource()

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 2 16:47:24 PDT 2018


Author: matze
Date: Thu Aug  2 16:47:23 2018
New Revision: 338787

URL: http://llvm.org/viewvc/llvm-project?rev=338787&view=rev
Log:
cmake: Make benchmark name an argument of llvm_multisource()

Modified:
    test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
    test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
    test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
    test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt
    test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
    test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/aha/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/d/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/hbd/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/lemon/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/siod/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/spiff/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/treecc/CMakeLists.txt
    test-suite/trunk/MultiSource/Applications/viterbi/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/7zip/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Bullet/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/RSBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/XSBench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniAMR/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniGMG/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/power/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
    test-suite/trunk/MultiSource/Examples/Noisy/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt
    test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt
    test-suite/trunk/cmake/modules/SingleMultiSource.cmake

Modified: test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -2,12 +2,11 @@ file(GLOB bcsources ${CMAKE_CURRENT_SOUR
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-set(PROG halide_bilateral_grid)
 
 test_img_input(rgb 0.1 10)
 test_img_input(rgba 0.1 10)
 
-llvm_multisource()
+llvm_multisource(halide_bilateral_grid)
 
 
 

Modified: test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -2,7 +2,6 @@ file(GLOB bcsources ${CMAKE_CURRENT_SOUR
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-set(PROG halide_blur)
 
-llvm_multisource()
+llvm_multisource(halide_blur)
 

Modified: test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -2,12 +2,11 @@ file(GLOB bcsources ${CMAKE_CURRENT_SOUR
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-set(PROG halide_local_laplacian)
 
 test_img_input(rgb 8 1 1 10)
 test_img_input(rgba 8 1 1 10)
 
-llvm_multisource()
+llvm_multisource(halide_local_laplacian)
 
 
 

Modified: test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Regression/fft/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -10,7 +10,6 @@ foreach(lib ${CMAKE_DL_LIBS})
 endforeach()
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
-set(PROG fft)
-llvm_multisource()
+llvm_multisource(fft)
 
 

Modified: test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -8,7 +8,6 @@ foreach(lib ${CMAKE_DL_LIBS})
 endforeach()
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
-set(PROG widen_bug)
-llvm_multisource()
+llvm_multisource(widen_bug)
 
 

Modified: test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -20,7 +20,6 @@ foreach(sourcebc ${uosources})
   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)
-  set(PROG simd_ops_${namebc})
-  llvm_multisource()
+  llvm_multisource(simd_ops_${namebc})
   target_link_libraries(${PROG} simd_ops)
 endforeach()

Modified: test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/decode/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -6,7 +6,6 @@ else()
   list(APPEND CXXFLAGS -DTARGET_RT_BIG_ENDIAN=1)
 endif()
 list(APPEND LDFLAGS -lstdc++)
-set(PROG alacconvert-decode)
 set(Sources EndianPortable.c ALACBitUtilities.c ALACDecoder.cpp ALACEncoder.cpp ag_dec.c ag_enc.c dp_dec.c dp_enc.c matrix_dec.c matrix_enc.c main.cpp CAFFileALAC.cpp)
 set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
-llvm_multisource()
+llvm_multisource(alacconvert-decode)

Modified: test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/encode/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -6,7 +6,6 @@ else()
   list(APPEND CXXFLAGS -DTARGET_RT_BIG_ENDIAN=1)
 endif()
 list(APPEND LDFLAGS -lstdc++)
-set(PROG alacconvert-encode)
 set(Sources EndianPortable.c ALACBitUtilities.c ALACDecoder.cpp ALACEncoder.cpp ag_dec.c ag_enc.c dp_dec.c dp_enc.c matrix_dec.c matrix_enc.c main.cpp CAFFileALAC.cpp)
 set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
-llvm_multisource()
+llvm_multisource(alacconvert-encode)

Modified: test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/Burg/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG burg)
 list(APPEND CPPFLAGS -DDEBUG)
 list(APPEND CFLAGS -std=gnu89)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(burg)

Modified: test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -99,7 +99,6 @@ set(Source
   zlib_uncompr.c
   zlib_zutil.c
 )
-set(PROG clamscan)
 list(APPEND CPPFLAGS -DHAVE_CONFIG_H -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/zlib -DDONT_LOCK_DBDIRS)
 
 set(INPUT
@@ -172,4 +171,4 @@ if(ENDIAN STREQUAL "big")
   list(APPEND CPPFLAGS -DWORDS_BIGENDIAN=1)
 endif()
 set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ")
-llvm_multisource()
+llvm_multisource(clamscan)

Modified: test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/ldecod/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG ldecod)
 list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm ${TOOLLINKOPTS})
 set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/data/test.264 -o Output/test_dec.yuv -r ${CMAKE_CURRENT_SOURCE_DIR}/data/test_rec.yuv)
@@ -6,4 +5,4 @@ set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
-llvm_multisource()
+llvm_multisource(ldecod)

Modified: test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/lencod/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG lencod)
 list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.025)
@@ -8,4 +7,4 @@ else()
   set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg)
 endif()
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(lencod)

Modified: test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/SIBsim4/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG SIBsim4)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x-small.fa ${CMAKE_CURRENT_SOURCE_DIR}/y-small.fa)
 else()
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x.fa ${CMAKE_CURRENT_SOURCE_DIR}/y.fa)
 endif()
-llvm_multisource()
+llvm_multisource(SIBsim4)

Modified: test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/SPASS/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG SPASS)
 list(APPEND CPPFLAGS -DCLOCK_NO_TIMING)
 list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
@@ -8,4 +7,4 @@ else()
   set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/problem.dfg")
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(SPASS)

Modified: test-suite/trunk/MultiSource/Applications/aha/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/aha/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/aha/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/aha/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG aha)
-llvm_multisource()
+llvm_multisource(aha)

Modified: test-suite/trunk/MultiSource/Applications/d/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/d/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/d/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/d/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG make_dparser)
 set(Source make_dparser.c write_ctables.c gram.c lex.c lr.c arg.c parse.c scan.c symtab.c util.c version.c grammar.g.c)
 list(APPEND CPPFLAGS -DD_BUILD_VERSION=5725)
 set(RUN_OPTIONS -v ${CMAKE_CURRENT_SOURCE_DIR}/grammar.g)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(make_dparser)

Modified: test-suite/trunk/MultiSource/Applications/hbd/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/hbd/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/hbd/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/hbd/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG hbd)
 list(APPEND CPPFLAGS -DHAVE_CONFIG_H)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sort.class)
 set(REQUIRES_EH_SUPPORT 1)
-llvm_multisource()
+llvm_multisource(hbd)

Modified: test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/hexxagon/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG hexxagon)
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
-llvm_multisource()
+llvm_multisource(hexxagon)
 target_include_directories(hexxagon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/kimwitu%2B%2B/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/kimwitu++/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG kc)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DYYDEBUG=1)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS -f test  -o -v -s kcc ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f3.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f2.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f1.k)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(kc)

Modified: test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG lambda)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(lambda)
 target_include_directories(lambda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Applications/lemon/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lemon/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lemon/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/lemon/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
 if(NOT TEST_SUITE_BENCHMARKING_ONLY)
   set(Source lemon.c)
-  set(PROG lemon)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y ${CMAKE_CURRENT_SOURCE_DIR}/example1.y ${CMAKE_CURRENT_SOURCE_DIR}/example2.y ${CMAKE_CURRENT_SOURCE_DIR}/example3.y ${CMAKE_CURRENT_SOURCE_DIR}/example4.y ${CMAKE_CURRENT_SOURCE_DIR}/example5.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_configparser.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_mod_ssi_exprparser.y ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_dtd_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_mate_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/xapian_queryparser.lemony ${CMAKE_CURRENT_SOURCE_DIR}/ecmascript.y)
   set(HASH_PROGRAM_OUTPUT 1)
   set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ")
-  llvm_multisource()
+  llvm_multisource(lemon)
 endif()

Modified: test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/lua/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -5,7 +5,6 @@ if(ARCH STREQUAL "XCore")
 else()
   list(APPEND CPPFLAGS -DLUA_USE_POSIX)
 endif()
-set(PROG lua)
 set(RUN_OPTIONS alltests.lua "")
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HASH_PROGRAM_OUTPUT 1)
@@ -21,5 +20,5 @@ add_custom_command(OUTPUT ${CMAKE_CURREN
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating lua test inputs")
 add_custom_target(lua_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/generate_inputs.sh)
-    llvm_multisource()
+    llvm_multisource(lua)
 add_dependencies(lua lua_input)

Modified: test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/minisat/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG minisat)
 list(APPEND LDFLAGS -lstdc++ -lm)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/small.cnf)
@@ -17,4 +16,4 @@ if(TARGET_OS STREQUAL "Darwin")
   set(SHLIBEXT .dylib)
 endif()
 list(APPEND JIT_OPTS -load libz${SHLIBEXT})
-llvm_multisource()
+llvm_multisource(minisat)

Modified: test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/obsequi/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG Obsequi)
 list(APPEND CPPFLAGS -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE)
 list(APPEND CPPFLAGS -DTWO_STAGE_GENERATION)
 if(SMALL_PROBLEM_SIZE)
@@ -10,4 +9,4 @@ if(NOT "${ARCH}" STREQUAL "PowerPC")
   list(APPEND LDFLAGS -lsupc++)
 endif()
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
-llvm_multisource()
+llvm_multisource(Obsequi)

Modified: test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/oggenc/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG oggenc)
 list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -Q -s 901820 - < ${CMAKE_CURRENT_SOURCE_DIR}/tune)
-llvm_multisource()
+llvm_multisource(oggenc)

Modified: test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/sgefa/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG sgefa)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.0001)
 if(LARGE_PROBLEM_SIZE)
@@ -6,4 +5,4 @@ if(LARGE_PROBLEM_SIZE)
 else()
   list(APPEND CPPFLAGS -DSCALE=40)
 endif()
-llvm_multisource()
+llvm_multisource(sgefa)

Modified: test-suite/trunk/MultiSource/Applications/siod/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/siod/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/siod/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/siod/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG siod)
 list(APPEND CPPFLAGS -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -v1 ${CMAKE_CURRENT_SOURCE_DIR}/test.scm)
-llvm_multisource()
+llvm_multisource(siod)

Modified: test-suite/trunk/MultiSource/Applications/spiff/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/spiff/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/spiff/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/spiff/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG spiff)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sample.3 ${CMAKE_CURRENT_SOURCE_DIR}/Sample.4)
 if(ARCH STREQUAL "XCore")
   if(NOT DEFINED SMALL_PROBLEM_SIZE)
     set(XCORE_TARGET_NEEDS_MEMORY 1024)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(spiff)

Modified: test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/sqlite3/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 set(Source sqlite3.c shell.c)
-set(PROG sqlite3)
 list(APPEND CPPFLAGS -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -I.)
 set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory: < ${CMAKE_CURRENT_SOURCE_DIR}/commands)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -16,5 +15,5 @@ add_custom_command(OUTPUT ${CMAKE_CURREN
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating sqlite test inputs")
 add_custom_target(sqlite_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)
-    llvm_multisource()
+    llvm_multisource(sqlite3)
 add_dependencies(sqlite3 sqlite_input)

Modified: test-suite/trunk/MultiSource/Applications/treecc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/treecc/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/treecc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/treecc/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG treecc)
 set(RUN_OPTIONS -n ${CMAKE_CURRENT_SOURCE_DIR}/examples/expr_cpp.tc)
-llvm_multisource()
+llvm_multisource(treecc)

Modified: test-suite/trunk/MultiSource/Applications/viterbi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/viterbi/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/viterbi/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/viterbi/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG viterbi)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-llvm_multisource()
+llvm_multisource(viterbi)

Modified: test-suite/trunk/MultiSource/Benchmarks/7zip/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/7zip/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/7zip/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/7zip/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG 7zip-benchmark)
 set(RUN_OPTIONS b)
 list(APPEND CFLAGS -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread)
 list(APPEND CXXFLAGS -Wno-error=c++11-narrowing -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread)
 list(APPEND LDFLAGS -lstdc++ -pthread)
 set(Source CPP/myWindows/myGetTickCount.cpp CPP/myWindows/wine_date_and_time.cpp CPP/myWindows/myAddExeFlag.cpp CPP/myWindows/mySplitCommandLine.cpp CPP/7zip/UI/Console/BenchCon.cpp CPP/7zip/UI/Console/ConsoleClose.cpp CPP/7zip/UI/Console/ExtractCallbackConsole.cpp CPP/7zip/UI/Console/List.cpp CPP/7zip/UI/Console/Main.cpp CPP/7zip/UI/Console/MainAr.cpp CPP/7zip/UI/Console/OpenCallbackConsole.cpp CPP/7zip/UI/Console/PercentPrinter.cpp CPP/7zip/UI/Console/UpdateCallbackConsole.cpp CPP/7zip/UI/Console/UserInputUtils.cpp CPP/Common/CommandLineParser.cpp CPP/Common/CRC.cpp CPP/Common/IntToString.cpp CPP/Common/ListFileUtils.cpp CPP/Common/StdInStream.cpp CPP/Common/StdOutStream.cpp CPP/Common/MyString.cpp CPP/Common/StringConvert.cpp CPP/Common/StringToInt.cpp CPP/Common/UTFConvert.cpp CPP/Common/MyWindows.cpp CPP/Common/MyVector.cpp CPP/Common/Wildcard.cpp CPP/Windows/Error.cpp CPP/Windows/FileDir.cpp CPP/Windows/FileFind.cpp CPP/Windows/FileIO.cpp CPP/Windows/FileName.cpp CPP/Windows/PropVariant.cpp CPP/Windows/PropVariantConversions.cpp CPP/Windows/Synchronization.cpp CPP/Windows/System.cpp CPP/Windows/Time.cpp CPP/7zip/Common/CreateCoder.cpp CPP/7zip/Common/CWrappers.cpp CPP/7zip/Common/FilePathAutoRename.cpp CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FilterCoder.cpp CPP/7zip/Common/InBuffer.cpp CPP/7zip/Common/InOutTempBuffer.cpp CPP/7zip/Common/LimitedStreams.cpp CPP/7zip/Common/LockedStream.cpp CPP/7zip/Common/MemBlocks.cpp CPP/7zip/Common/MethodId.cpp CPP/7zip/Common/MethodProps.cpp CPP/7zip/Common/OffsetStream.cpp CPP/7zip/Common/OutBuffer.cpp CPP/7zip/Common/OutMemStream.cpp CPP/7zip/Common/ProgressMt.cpp CPP/7zip/Common/ProgressUtils.cpp CPP/7zip/Common/StreamBinder.cpp CPP/7zip/Common/StreamObjects.cpp CPP/7zip/Common/StreamUtils.cpp CPP/7zip/Common/VirtThread.cpp CPP/7zip/UI/Common/ArchiveCommandLine.cpp CPP/7zip/UI/Common/ArchiveExtractCallback.cpp CPP/7zip/UI/Common/ArchiveOpenCallback.cpp CPP/7zip/UI/Common/Bench.cpp CPP/7zip/UI/Common/DefaultName.cpp CPP/7zip/UI/Common/EnumDirItems.cpp CPP/7zip/UI/Common/Extract.cpp CPP/7zip/UI/Common/ExtractingFilePath.cpp CPP/7zip/UI/Common/LoadCodecs.cpp CPP/7zip/UI/Common/OpenArchive.cpp CPP/7zip/UI/Common/PropIDUtils.cpp CPP/7zip/UI/Common/SetProperties.cpp CPP/7zip/UI/Common/SortUtils.cpp CPP/7zip/UI/Common/TempFiles.cpp CPP/7zip/UI/Common/Update.cpp CPP/7zip/UI/Common/UpdateAction.cpp CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdatePair.cpp CPP/7zip/UI/Common/UpdateProduce.cpp CPP/7zip/Archive/Bz2Handler.cpp CPP/7zip/Archive/DeflateProps.cpp CPP/7zip/Archive/GzHandler.cpp CPP/7zip/Archive/LzmaHandler.cpp CPP/7zip/Archive/PpmdHandler.cpp CPP/7zip/Archive/SplitHandler.cpp CPP/7zip/Archive/XzHandler.cpp CPP/7zip/Archive/ZHandler.cpp CPP/7zip/Archive/Common/CoderMixer2.cpp CPP/7zip/Archive/Common/CoderMixer2MT.cpp CPP/7zip/Archive/Common/CrossThreadProgress.cpp CPP/7zip/Archive/Common/DummyOutStream.cpp CPP/7zip/Archive/Common/FindSignature.cpp CPP/7zip/Archive/Common/HandlerOut.cpp CPP/7zip/Archive/Common/InStreamWithCRC.cpp CPP/7zip/Archive/Common/ItemNameUtils.cpp CPP/7zip/Archive/Common/MultiStream.cpp CPP/7zip/Archive/Common/OutStreamWithCRC.cpp CPP/7zip/Archive/Common/ParseProperties.cpp CPP/7zip/Archive/7z/7zCompressionMode.cpp CPP/7zip/Archive/7z/7zDecode.cpp CPP/7zip/Archive/7z/7zEncode.cpp CPP/7zip/Archive/7z/7zExtract.cpp CPP/7zip/Archive/7z/7zFolderInStream.cpp CPP/7zip/Archive/7z/7zFolderOutStream.cpp CPP/7zip/Archive/7z/7zHandler.cpp CPP/7zip/Archive/7z/7zHandlerOut.cpp CPP/7zip/Archive/7z/7zHeader.cpp CPP/7zip/Archive/7z/7zIn.cpp CPP/7zip/Archive/7z/7zOut.cpp CPP/7zip/Archive/7z/7zProperties.cpp CPP/7zip/Archive/7z/7zSpecStream.cpp CPP/7zip/Archive/7z/7zUpdate.cpp CPP/7zip/Archive/7z/7zRegister.cpp CPP/7zip/Archive/Cab/CabBlockInStream.cpp CPP/7zip/Archive/Cab/CabHandler.cpp CPP/7zip/Archive/Cab/CabHeader.cpp CPP/7zip/Archive/Cab/CabIn.cpp CPP/7zip/Archive/Cab/CabRegister.cpp CPP/7zip/Archive/Tar/TarHandler.cpp CPP/7zip/Archive/Tar/TarHandlerOut.cpp CPP/7zip/Archive/Tar/TarHeader.cpp CPP/7zip/Archive/Tar/TarIn.cpp CPP/7zip/Archive/Tar/TarOut.cpp CPP/7zip/Archive/Tar/TarUpdate.cpp CPP/7zip/Archive/Tar/TarRegister.cpp CPP/7zip/Archive/Zip/ZipAddCommon.cpp CPP/7zip/Archive/Zip/ZipHandler.cpp CPP/7zip/Archive/Zip/ZipHandlerOut.cpp CPP/7zip/Archive/Zip/ZipHeader.cpp CPP/7zip/Archive/Zip/ZipIn.cpp CPP/7zip/Archive/Zip/ZipItem.cpp CPP/7zip/Archive/Zip/ZipOut.cpp CPP/7zip/Archive/Zip/ZipUpdate.cpp CPP/7zip/Archive/Zip/ZipRegister.cpp CPP/7zip/Compress/Bcj2Coder.cpp CPP/7zip/Compress/Bcj2Register.cpp CPP/7zip/Compress/BcjCoder.cpp CPP/7zip/Compress/BcjRegister.cpp CPP/7zip/Compress/BitlDecoder.cpp CPP/7zip/Compress/BranchCoder.cpp CPP/7zip/Compress/BranchMisc.cpp CPP/7zip/Compress/BranchRegister.cpp CPP/7zip/Compress/ByteSwap.cpp CPP/7zip/Compress/BZip2Crc.cpp CPP/7zip/Compress/BZip2Decoder.cpp CPP/7zip/Compress/BZip2Encoder.cpp CPP/7zip/Compress/BZip2Register.cpp CPP/7zip/Compress/CopyCoder.cpp CPP/7zip/Compress/CopyRegister.cpp CPP/7zip/Compress/Deflate64Register.cpp CPP/7zip/Compress/DeflateDecoder.cpp CPP/7zip/Compress/DeflateEncoder.cpp CPP/7zip/Compress/DeflateRegister.cpp CPP/7zip/Compress/DeltaFilter.cpp CPP/7zip/Compress/ImplodeDecoder.cpp CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp CPP/7zip/Compress/Lzma2Decoder.cpp CPP/7zip/Compress/Lzma2Encoder.cpp CPP/7zip/Compress/Lzma2Register.cpp CPP/7zip/Compress/LzmaDecoder.cpp CPP/7zip/Compress/LzmaEncoder.cpp CPP/7zip/Compress/LzmaRegister.cpp CPP/7zip/Compress/LzOutWindow.cpp CPP/7zip/Compress/Lzx86Converter.cpp CPP/7zip/Compress/LzxDecoder.cpp CPP/7zip/Compress/PpmdDecoder.cpp CPP/7zip/Compress/PpmdEncoder.cpp CPP/7zip/Compress/PpmdRegister.cpp CPP/7zip/Compress/PpmdZip.cpp CPP/7zip/Compress/QuantumDecoder.cpp CPP/7zip/Compress/ShrinkDecoder.cpp CPP/7zip/Compress/ZDecoder.cpp CPP/7zip/Crypto/7zAes.cpp CPP/7zip/Crypto/7zAesRegister.cpp CPP/7zip/Crypto/HmacSha1.cpp CPP/7zip/Crypto/MyAes.cpp CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp CPP/7zip/Crypto/RandGen.cpp CPP/7zip/Crypto/Sha1.cpp CPP/7zip/Crypto/WzAes.cpp CPP/7zip/Crypto/ZipCrypto.cpp CPP/7zip/Crypto/ZipStrong.cpp C/7zStream.c C/Aes.c C/Alloc.c C/Bra.c C/Bra86.c C/BraIA64.c C/BwtSort.c C/Delta.c C/HuffEnc.c C/LzFind.c C/LzFindMt.c C/Lzma2Dec.c C/Lzma2Enc.c C/LzmaDec.c C/LzmaEnc.c C/MtCoder.c C/Ppmd7.c C/Ppmd7Dec.c C/Ppmd7Enc.c C/Ppmd8.c C/Ppmd8Dec.c C/Ppmd8Enc.c C/Sha256.c C/Sort.c C/Threads.c C/Xz.c C/XzCrc64.c C/XzDec.c C/XzEnc.c C/XzIn.c C/7zCrc.c C/7zCrcOpt.c)
 set(NO_REFERENCE_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(7zip-benchmark)

Modified: test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG smg2000)
 list(APPEND CPPFLAGS -D_POSIX_SOURCE -DHYPRE_TIMING -DHYPRE_SEQUENTIAL )
 list(APPEND CPPFLAGS -I. )
 list(APPEND LDFLAGS -lm)
@@ -10,5 +9,5 @@ else()
     set(XCORE_TARGET_NEEDS_MEMORY 256)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(smg2000)
 target_include_directories(smg2000 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG AMGmk)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(AMGmk)

Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG CrystalMk)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(CrystalMk)

Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG IRSmk)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/irsmk_input)
-llvm_multisource()
+llvm_multisource(IRSmk)

Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG drop3)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
-llvm_multisource()
+llvm_multisource(drop3)

Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG five11)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
-llvm_multisource()
+llvm_multisource(five11)

Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG uudecode)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
-llvm_multisource()
+llvm_multisource(uudecode)

Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG uuencode)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
-llvm_multisource()
+llvm_multisource(uuencode)

Modified: test-suite/trunk/MultiSource/Benchmarks/Bullet/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Bullet/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Bullet/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Bullet/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG bullet)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/include -std=gnu++98 -DNO_TIME)
 list(APPEND LDFLAGS -lstdc++ -lm)
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
-llvm_multisource()
+llvm_multisource(bullet)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/CLAMR/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG CLAMR)
 set(RUN_OPTIONS -n 64 -t 1000)
-llvm_multisource()
+llvm_multisource(CLAMR)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/HACCKernels/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG HACCKernels)
 set(FP_TOLERANCE 0.00001)
 list(APPEND CPPFLAGS -ffast-math -DVERIFICATION_OUTPUT_ONLY=ON)
 set(RUN_OPTIONS 450)
-llvm_multisource()
+llvm_multisource(HACCKernels)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/HPCCG/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG HPCCG)
 list(APPEND CXXFLAGS -DREDSTORM) # -DREDSTORM for mkdir
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS 50 50 50)
-llvm_multisource()
+llvm_multisource(HPCCG)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/PENNANT/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/PENNANT/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG PENNANT)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/intermediate_leblanc.pnt)
-llvm_multisource()
+llvm_multisource(PENNANT)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C%2B%2B/miniFE/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG miniFE)
 list(APPEND CXXFLAGS -I. -DMINIFE_SCALAR=double  -DMINIFE_LOCAL_ORDINAL=int -DMINIFE_GLOBAL_ORDINAL=int -DMINIFE_CSR_MATRIX -DREDSTORM) # -DREDSTORM for mkdir
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -nx 64 -ny 64 -nz 64)
-llvm_multisource()
+llvm_multisource(miniFE)
 target_include_directories(miniFE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/Pathfinder/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG PathFinder)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -x ${CMAKE_CURRENT_SOURCE_DIR}/medsmall1.adj_list) 
-llvm_multisource()
+llvm_multisource(PathFinder)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/RSBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/RSBench/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/RSBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/RSBench/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG rsbench)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS -s small -l 100000 -p 1000 -w 1000)
-llvm_multisource()
+llvm_multisource(rsbench)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/SimpleMOC/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG SimpleMOC)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/default.in)
-llvm_multisource()
+llvm_multisource(SimpleMOC)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/XSBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/XSBench/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/XSBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/XSBench/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG XSBench)
 list(APPEND CPPFLAGS -DVERIFICATION)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -s small -g 1250 -l 1000000)
-llvm_multisource()
+llvm_multisource(XSBench)

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniAMR/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniAMR/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniAMR/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniAMR/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG miniAMR)
 list(APPEND CPPFLAGS -I.)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS --nx 8 --ny 8 --nz 8 --num_tsteps 100)
-llvm_multisource()
+llvm_multisource(miniAMR)
  

Modified: test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniGMG/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniGMG/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniGMG/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/DOE-ProxyApps-C/miniGMG/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG miniGMG)
 list(APPEND CFLAGS -D__PRINT_NORM)
 list(APPEND LDFLAGS -lm)
 set(FP_ABSTOLERANCE 0.00000001)
 set(RUN_OPTIONS 5  2 2 2  1 1 1)
-llvm_multisource()
+llvm_multisource(miniGMG)

Modified: test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG fhourstones3.1)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
 else()
@@ -7,4 +6,4 @@ endif()
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
-llvm_multisource()
+llvm_multisource(fhourstones3.1)

Modified: test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG fhourstones)
 list(APPEND CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
-llvm_multisource()
+llvm_multisource(fhourstones)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG analyzer)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
-llvm_multisource()
+llvm_multisource(analyzer)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG distray)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
@@ -7,4 +6,4 @@ else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(distray)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG fourinarow)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
-llvm_multisource()
+llvm_multisource(fourinarow)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG mason)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/ref.in)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
-llvm_multisource()
+llvm_multisource(mason)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG neural)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
@@ -6,4 +5,4 @@ if(LARGE_PROBLEM_SIZE)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
-llvm_multisource()
+llvm_multisource(neural)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG pcompress2)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 if(LARGE_PROBLEM_SIZE)
   set(INPUT_FILE ref.in)
@@ -13,5 +12,5 @@ add_custom_command(OUTPUT ${CMAKE_CURREN
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Copying pcompress2 test input")
 add_custom_target(pcompress2_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${INPUT_FILE})
-    llvm_multisource()
+    llvm_multisource(pcompress2)
 add_dependencies(pcompress2 pcompress2_input)

Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG pifft)
 list(APPEND CPPFLAGS -DVERSION="1.00" -DCOMPDATE="today" -DCFLAGS="" -DHOSTNAME="thishost")
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
@@ -6,4 +5,4 @@ if(LARGE_PROBLEM_SIZE)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
-llvm_multisource()
+llvm_multisource(pifft)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG cfrac)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 list(APPEND LDFLAGS -lm)
 set(Source cfrac.c pops.c pconst.c pio.c pabs.c pneg.c pcmp.c podd.c phalf.c padd.c psub.c pmul.c pdivmod.c psqrt.c ppowmod.c atop.c ptoa.c itop.c utop.c ptou.c errorp.c pfloat.c pidiv.c pimod.c picmp.c primes.c pcfrac.c pgcd.c)
@@ -7,4 +6,4 @@ if(LARGE_PROBLEM_SIZE)
 else()
   set(RUN_OPTIONS 41757646344123832613190542166099121)
 endif()
-llvm_multisource()
+llvm_multisource(cfrac)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG espresso)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 list(APPEND CFLAGS -std=gnu89)
 set(RUN_OPTIONS -t ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/largest.espresso)
-llvm_multisource()
+llvm_multisource(espresso)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
 set(RUN_OPTIONS -f ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/adj.awk type=l linelen=70 indent=5 ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/words-large.awk)
-set(PROG gawk)
 list(APPEND LDFLAGS -lm)
 set(Source alloca.c awk.tab.c debug.c field.c main.c msg.c regex.c array.c builtin.c eval.c io.c node.c)
 list(APPEND CPPFLAGS -DBCOPY_MISSING -DSPRINTF_INT -DDOPRNT_MISSING  -DGCVT_MISSING -DSTRCASE_MISSING -DSTRTOD_MISSING  -DTMPNAM_MISSING)
 
-llvm_multisource()
+llvm_multisource(gawk)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG gs)
 list(APPEND LDFLAGS -lm)
 list(APPEND CPPFLAGS -DNOMEMOPT -DGS_LIB_DEFAULT="${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/fonts")
 list(APPEND CFLAGS -Wno-implicit-function-declaration)
@@ -7,4 +6,4 @@ set(Source gs.c gsmain.c gp_unix.c utrac
 list(APPEND Source ialloc.c idebug.c idict.c iinit.c iname.c interp.c iscan.c iutil.c stream.c zarith.c zarray.c zcontrol.c zdict.c zfile.c zgeneric.c zmath.c zmisc.c zpacked.c zrelbit.c zstack.c zstring.c ztype.c zvmem.c zchar.c zcolor.c zfont.c zdevice.c zgstate.c zht.c zmatrix.c zpaint.c zpath.c zpath2.c)
 list(APPEND Source gschar.c gscolor.c gscoord.c gsdevice.c gsfile.c gsfont.c gsimage.c gsim2out.c gsline.c gsmatrix.c gsmisc.c gspaint.c gspath.c gspath2.c gsstate.c gstype1.c gxcache.c gxcolor.c gxdither.c gxdraw.c gxfill.c gxht.c gxpath.c gxpath2.c gxstroke.c gdevmem.c gdevs.c)
 set(RUN_OPTIONS -DNODISPLAY ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/large.ps)
-llvm_multisource()
+llvm_multisource(gs)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG make)
 list(APPEND CPPFLAGS -DHAVE_SIGLIST -DNO_LDAV -DNOMEMOPT -DPOSIX)
 set(Source commands.c job.c dir.c file.c load.c misc.c main.c read.c remake.c remote.c rule.c implicit.c default.c variable.c expand.c function.c vpath.c version.c arscan.c ar.c)
 set(RUN_OPTIONS -n -f ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/GNUmakefile.make USEROPT=BWGC VPATH=${CMAKE_CURRENT_SOURCE_DIR})
-llvm_multisource()
+llvm_multisource(make)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG p2c)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 set(RUN_OPTIONS -v < ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p)
-llvm_multisource()
+llvm_multisource(p2c)

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG perl)
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND CPPFLAGS -DHAS_STRERROR -DHAS_MKDIR -DHAS_RMDIR -U_POSIX_SOURCE -D__USE_MISC)
 list(APPEND LDFLAGS -lm -lcrypt)
 set(Source array.c doarg.c eval.c regexec.c cmd.c doio.c form.c perl.c stab.c usersub.c cons.c dolist.c hash.c perly.c str.c util.c consarg.c dump.c malloc.c regcomp.c toke.c)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/endsort.perl ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/endsort.perl)
-llvm_multisource()
+llvm_multisource(perl)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG qbsort)
 set(RUN_OPTIONS 1000 < ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3)
 list(APPEND LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(qbsort)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG testtrie)
 list(APPEND LDFLAGS -lm)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/testtrie.in2)
-llvm_multisource()
+llvm_multisource(testtrie)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG bisect)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.001)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in)
-llvm_multisource()
+llvm_multisource(bisect)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG eks)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(eks)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG main)
 list(APPEND LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(main)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG vor)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(vor)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG iotest)
-llvm_multisource()
+llvm_multisource(iotest)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG trie)
 list(APPEND LDFLAGS -lm)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/trie.in1)
-llvm_multisource()
+llvm_multisource(trie)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG bintr)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1)
-llvm_multisource()
+llvm_multisource(bintr)

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG imp)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/sg01.imp)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(imp)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG automotive-basicmath)
 list(APPEND LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(automotive-basicmath)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG automotive-bitcount)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS 1125000)
-llvm_multisource()
+llvm_multisource(automotive-bitcount)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG automotive-susan)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.pgm /dev/null -s)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(automotive-susan)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG consumer-jpeg)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -dct int -ppm -outfile /dev/null ${CMAKE_CURRENT_SOURCE_DIR}/input_large.jpg)
-llvm_multisource()
+llvm_multisource(consumer-jpeg)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG consumer-lame)
 list(APPEND CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -DLAMESNDFILE)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav /dev/null)
-llvm_multisource()
+llvm_multisource(consumer-lame)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG consumer-typeset)
 list(APPEND CPPFLAGS -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR="lout.lib" -DFONT_DIR="font" -DMAPS_DIR="maps" -DINCL_DIR="include" -DDATA_DIR="data" -DHYPH_DIR="hyph" -DLOCALE_DIR="locale" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -x -I ${CMAKE_CURRENT_SOURCE_DIR}/data/include -D ${CMAKE_CURRENT_SOURCE_DIR}/data/data -F ${CMAKE_CURRENT_SOURCE_DIR}/data/font -C ${CMAKE_CURRENT_SOURCE_DIR}/data/maps -H ${CMAKE_CURRENT_SOURCE_DIR}/data/hyph ${CMAKE_CURRENT_SOURCE_DIR}/large.lout)
 
-llvm_multisource()
+llvm_multisource(consumer-typeset)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG network-dijkstra)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.dat)
-llvm_multisource()
+llvm_multisource(network-dijkstra)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG network-patricia)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.udp)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(network-patricia)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG office-ispell)
 list(APPEND CPPFLAGS -Dconst=)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+ < ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
-llvm_multisource()
+llvm_multisource(office-ispell)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG office-stringsearch)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(office-stringsearch)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG security-blowfish)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS print_test_data)
-llvm_multisource()
+llvm_multisource(security-blowfish)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG security-rijndael)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/output_large.enc /dev/null d 1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(security-rijndael)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG security-sha)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.asc )
-llvm_multisource()
+llvm_multisource(security-sha)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG telecomm-CRC32)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.pcm)
-llvm_multisource()
+llvm_multisource(telecomm-CRC32)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG telecomm-fft)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS 8 32768 -i)
 set(FP_ABSTOLERANCE 0.00001)
 set(HASH_PROGRAM_OUTPUT 1)
 add_definitions(-DFP_ABSTOLERANCE=1e-5)
-llvm_multisource()
+llvm_multisource(telecomm-fft)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG telecomm-adpcm)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(telecomm-adpcm)

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG telecomm-gsm)
 list(APPEND CPPFLAGS -DSTUPID_COMPILER -DNeedFunctionPrototypes=1 -DSASR)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -fps -c ${CMAKE_CURRENT_SOURCE_DIR}/large.au)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(telecomm-gsm)

Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG dc)
 set(Source adc.c dc.c jobcntl.c c_print_results.c extbuild.c rbt.c)
 set(RUN_OPTIONS 10000000 ADC.par)
 if(SMALL_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DSMALL_PROBLEM_SIZE)
 endif()
-llvm_multisource()
+llvm_multisource(dc)

Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG is)
 if(SMALL_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DSMALL_PROBLEM_SIZE)
 else()
@@ -6,4 +5,4 @@ else()
     set(XCORE_TARGET_NEEDS_MEMORY 512)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(is)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG bh)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
@@ -10,4 +9,4 @@ else()
     set(RUN_OPTIONS 20000 20)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(bh)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG bisort)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
@@ -6,4 +5,4 @@ if(LARGE_PROBLEM_SIZE)
 else()
   set(RUN_OPTIONS 700000)
 endif()
-llvm_multisource()
+llvm_multisource(bisort)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG em3d)
 list(APPEND CPPFLAGS -DTORONTO)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS 256 250 35)
 else()
   set(RUN_OPTIONS 1024 1000 125)
 endif()
-llvm_multisource()
+llvm_multisource(em3d)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/health/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG health)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.001)
@@ -14,4 +13,4 @@ else()
     endif()
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(health)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG mst)
 list(APPEND CPPFLAGS -DTORONTO)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 4000)
 else()
   set(RUN_OPTIONS 1000)
 endif()
-llvm_multisource()
+llvm_multisource(mst)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG perimeter)
 list(APPEND CPPFLAGS -DTORONTO)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 11)
@@ -12,4 +11,4 @@ else()
     endif()
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(perimeter)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/power/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/power/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/power/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/power/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG power)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.00001)
-llvm_multisource()
+llvm_multisource(power)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG treeadd)
 list(APPEND CPPFLAGS -DTORONTO)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS 20)
@@ -8,4 +7,4 @@ else()
     set(XCORE_TARGET_NEEDS_MEMORY 128)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(treeadd)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG tsp)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
@@ -13,4 +12,4 @@ else()
     endif()
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(tsp)

Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG voronoi)
 set(INCLUDES defines.h)
 list(APPEND CPPFLAGS -DTORONTO)
 list(APPEND LDFLAGS -lm)
@@ -15,4 +14,4 @@ else()
   endif()
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(voronoi)

Modified: test-suite/trunk/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG optimizer-eval)
 list(APPEND LDFLAGS -lm)
 set(NO_REFERENCE_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(optimizer-eval)

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG paq8p)
 list(APPEND CPPFLAGS -DNOASM -DLLVM)
 list(APPEND LDFLAGS -lstdc++ -lm)
 if(SMALL_PROBLEM_SIZE)
@@ -7,4 +6,4 @@ else()
   set(RUN_OPTIONS -4 ${CMAKE_CURRENT_SOURCE_DIR}/file1.in)
 endif()
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(paq8p)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/NP/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG np)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(np)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/city/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG city)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(city)
 target_include_directories(city PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/deriv1/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG deriv1)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(deriv1)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/deriv2/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG deriv2)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(deriv2)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/employ/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG employ)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS 400 < ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(employ)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/family/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG family)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(family)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/fsm/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG fsm)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(fsm)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/garage/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG garage)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(garage)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/life/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG life)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(life)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/objects/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG objects)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(objects)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/ocean/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG ocean)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(ocean)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/office/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG office)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(office)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/primes/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG primes)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(primes)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/shapes/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG shapes)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(shapes)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/simul/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG simul)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(simul)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/trees/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG trees)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(trees)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/vcirc/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG vcirc)
 list(APPEND LDFLAGS -lstdc++)
-llvm_multisource()
+llvm_multisource(vcirc)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG timberwolfmc)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(timberwolfmc)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG agrep)
 set(RUN_OPTIONS -2 int ${CMAKE_CURRENT_SOURCE_DIR}/InstructionCombining.cpp.txt)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(agrep)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG allroots)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(allroots)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -2,10 +2,9 @@ include(CheckFunctionExists)
 check_function_exists(re_comp HAVE_RE_COMP)
 
 if(HAVE_RE_COMP)
-  set(PROG archie)
   if(TARGET_OS STREQUAL "SunOS")
     list(APPEND LDFLAGS -lsocket -lnsl)
   endif()
-  llvm_multisource()
+  llvm_multisource(archie)
   target_include_directories(archie PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 endif()

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG assembler)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(assembler)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG mybison)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y.in -v)
-llvm_multisource()
+llvm_multisource(mybison)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
 list(APPEND CFLAGS -std=gnu89)
-set(PROG cdecl)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/testset)
-llvm_multisource()
+llvm_multisource(cdecl)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG compiler)
-llvm_multisource()
+llvm_multisource(compiler)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG fixoutput)
-llvm_multisource()
+llvm_multisource(fixoutput)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG football)
-llvm_multisource()
+llvm_multisource(football)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG gnugo)
 set(HASH_PROGRAM_OUTPUT 1)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/stdin)
-llvm_multisource()
+llvm_multisource(gnugo)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG loader)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(loader)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
 include(CheckFunctionExists)
 check_function_exists(re_comp HAVE_RE_COMP)
 if(HAVE_RE_COMP)
-  set(PROG plot2fig)
   list(APPEND LDFLAGS -lm)
-  llvm_multisource()
+  llvm_multisource(plot2fig)
 endif()

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG simulator)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(simulator)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG unix-smail)
 set(RUN_OPTIONS -v ALL < ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
-llvm_multisource()
+llvm_multisource(unix-smail)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG unix-tbl)
-llvm_multisource()
+llvm_multisource(unix-tbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG anagram)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2 < ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT)
-llvm_multisource()
+llvm_multisource(anagram)

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG bc)
 set(OBJS scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/primes.b)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(bc)

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG ft)
 if(LARGE_PROBLEM_SIZE)
   list(APPEND RUN_OPTIONS 6000 100000)
 else()
   list(APPEND RUN_OPTIONS 1500 100000)
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(ft)

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG ks)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/KL-4.in)
-llvm_multisource()
+llvm_multisource(ks)

Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG yacr2)
 list(APPEND CPPFLAGS -DTODD)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input2.in)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(yacr2)

Modified: test-suite/trunk/MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Rodinia/hotspot/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG hotspot)
 set(FP_ABSTOLERANCE 0.00001)
 list(APPEND CFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/../Common)
 set(Source hotspotKernel.c main.c ../Common/glibc_compat_rand.c)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 
-llvm_multisource()
+llvm_multisource(hotspot)

Modified: test-suite/trunk/MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Rodinia/srad/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG srad)
 list(APPEND LDFLAGS -lm)
 set(FP_ABSTOLERANCE 0.00001)
 list(APPEND CFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/../Common)
 set(Source main.c sradKernel.c ../Common/glibc_compat_rand.c)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(srad)

Modified: test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,6 +1,5 @@
-set(PROG scimark2)
 list(APPEND LDFLAGS -lm)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -large)
 endif()
-llvm_multisource()
+llvm_multisource(scimark2)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG ControlFlow-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 2325 14)
-llvm_multisource()
+llvm_multisource(ControlFlow-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG ControlFlow-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 2325 5)
-llvm_multisource()
+llvm_multisource(ControlFlow-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG ControlLoops-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1640 14)
-llvm_multisource()
+llvm_multisource(ControlLoops-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG ControlLoops-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1640 5)
-llvm_multisource()
+llvm_multisource(ControlLoops-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG CrossingThresholds-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5880 14)
-llvm_multisource()
+llvm_multisource(CrossingThresholds-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG CrossingThresholds-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5880 5)
-llvm_multisource()
+llvm_multisource(CrossingThresholds-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Equivalencing-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3125 14)
-llvm_multisource()
+llvm_multisource(Equivalencing-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Equivalencing-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3125 5)
-llvm_multisource()
+llvm_multisource(Equivalencing-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Expansion-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4160 14)
-llvm_multisource()
+llvm_multisource(Expansion-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Expansion-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4160 5)
-llvm_multisource()
+llvm_multisource(Expansion-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG GlobalDataFlow-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3450 14)
-llvm_multisource()
+llvm_multisource(GlobalDataFlow-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG GlobalDataFlow-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3450 5)
-llvm_multisource()
+llvm_multisource(GlobalDataFlow-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG IndirectAddressing-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 12500 14)
-llvm_multisource()
+llvm_multisource(IndirectAddressing-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG IndirectAddressing-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 12500 5)
-llvm_multisource()
+llvm_multisource(IndirectAddressing-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG InductionVariable-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9100 14)
-llvm_multisource()
+llvm_multisource(InductionVariable-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG InductionVariable-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9100 5)
-llvm_multisource()
+llvm_multisource(InductionVariable-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG LinearDependence-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3570 14)
-llvm_multisource()
+llvm_multisource(LinearDependence-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG LinearDependence-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3570 5)
-llvm_multisource()
+llvm_multisource(LinearDependence-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG LoopRerolling-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5260 14)
-llvm_multisource()
+llvm_multisource(LoopRerolling-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG LoopRerolling-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5260 5)
-llvm_multisource()
+llvm_multisource(LoopRerolling-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG LoopRestructuring-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4350 14)
-llvm_multisource()
+llvm_multisource(LoopRestructuring-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG LoopRestructuring-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4350 5)
-llvm_multisource()
+llvm_multisource(LoopRestructuring-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG NodeSplitting-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 10000 14)
-llvm_multisource()
+llvm_multisource(NodeSplitting-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG NodeSplitting-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 10000 5)
-llvm_multisource()
+llvm_multisource(NodeSplitting-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Packing-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 50000 14)
-llvm_multisource()
+llvm_multisource(Packing-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Packing-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 50000 5)
-llvm_multisource()
+llvm_multisource(Packing-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Recurrences-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 14)
-llvm_multisource()
+llvm_multisource(Recurrences-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Recurrences-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 5)
-llvm_multisource()
+llvm_multisource(Recurrences-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Reductions-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1670 14)
-llvm_multisource()
+llvm_multisource(Reductions-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Reductions-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1670 5)
-llvm_multisource()
+llvm_multisource(Reductions-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Searching-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 80000 14)
-llvm_multisource()
+llvm_multisource(Searching-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Searching-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 80000 5)
-llvm_multisource()
+llvm_multisource(Searching-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG StatementReordering-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 14)
-llvm_multisource()
+llvm_multisource(StatementReordering-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG StatementReordering-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 5)
-llvm_multisource()
+llvm_multisource(StatementReordering-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Symbolics-dbl)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9090 14)
-llvm_multisource()
+llvm_multisource(Symbolics-dbl)

Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG Symbolics-flt)
 list(APPEND LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9090 5)
-llvm_multisource()
+llvm_multisource(Symbolics-flt)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG enc-3des)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 200)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS 100)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(enc-3des)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG enc-md5)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 50)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS 10)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(enc-md5)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG enc-pc1)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 20000000)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS 5000000)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(enc-pc1)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG enc-rc4)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1000000)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS 200000)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(enc-rc4)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG netbench-crc)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 40000)
 else()
@@ -11,4 +10,4 @@ else()
     endif()
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(netbench-crc)

Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG netbench-url)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 1400)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 900)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(netbench-url)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG 8b10b)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 2000)
 else()
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 20000)
 endif()
-llvm_multisource()
+llvm_multisource(8b10b)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 list(APPEND LDFLAGS -lm)
-set(PROG beamformer)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -i 400)
 else()
@@ -11,4 +10,4 @@ else()
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 add_definitions(-DFP_ABSTOLERANCE=1e-5)
-llvm_multisource()
+llvm_multisource(beamformer)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG bmm)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1024 1024)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS 1024 64)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(bmm)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,8 +1,7 @@
-set(PROG dbms)
 list(APPEND LDFLAGS -lm)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.train.in)
 else()
   set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.ref.in)
 endif()
-llvm_multisource()
+llvm_multisource(dbms)

Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG ecbdes)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 34)
 else()
@@ -8,4 +7,4 @@ else()
     set(RUN_OPTIONS 16)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(ecbdes)

Modified: test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,7 +1,6 @@
-set(PROG llu)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS -i 6000)
 else()
   set(RUN_OPTIONS -i 3000)
 endif()
-llvm_multisource()
+llvm_multisource(llu)

Modified: test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mafft/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 set(Source Calignm1.c constants.c defs.c Falign.c fft.c fftFunctions.c Galign11.c genalign11.c genGalign11.c Halignmm.c io.c Lalign11.c Lalignmm.c mltaln9.c MSalign11.c MSalignmm.c mtxutl.c pairlocalalign.c partQalignmm.c partSalignmm.c Qalignmm.c Ralignmm.c rna.c SAalignmm.c Salignmm.c suboptalign11.c tddis.c)
-set(PROG pairlocalalign)
 list(APPEND CPPFLAGS -DLLVM)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L < ${CMAKE_CURRENT_SOURCE_DIR}/pyruvate_decarboxylase.fasta)
@@ -8,4 +7,4 @@ set(HASH_PROGRAM_OUTPUT 1)
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 256)
 endif()
-llvm_multisource()
+llvm_multisource(pairlocalalign)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm )
-set(PROG rawcaudio)
 set(Source rawcaudio.c adpcm.c)
-llvm_multisource()
+llvm_multisource(rawcaudio)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm )
-set(PROG rawdaudio)
 set(HASH_PROGRAM_OUTPUT 1)
 set(Source rawdaudio.c adpcm.c)
-llvm_multisource()
+llvm_multisource(rawdaudio)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
 set(RUN_OPTIONS -4 -l < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
-set(PROG encode)
 set(Source encode.c  g711.c  g721.c  g723_24.c  g723_40.c  g72x.c)
-llvm_multisource()
+llvm_multisource(encode)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 set(RUN_OPTIONS -cpl ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
-set(PROG toast)
 list(APPEND CPPFLAGS -DNeedFunctionPrototypes=1 -DSASR)
 set(Source add.c         gsm_decode.c   gsm_option.c  rpe.c          toast.c code.c        gsm_destroy.c  gsm_print.c   short_term.c   toast_lin.c debug.c       gsm_encode.c   long_term.c   table.c     toast_ulaw.c decode.c      gsm_explode.c  lpc.c         toast_alaw.c gsm_create.c  gsm_implode.c  preprocess.c  toast_audio.c)
-llvm_multisource()
+llvm_multisource(toast)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 set(RUN_OPTIONS -dct int -progressive -opt ${CMAKE_CURRENT_SOURCE_DIR}/../data/testimg.ppm)
-set(PROG cjpeg)
 set(Source jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c jfdctint.c jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c jcomapi.c jutils.c jerror.c jmemmgr.c jmemnobs.c)
 list(APPEND Source cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c rdswitch.c cdjpeg.c)
-llvm_multisource()
+llvm_multisource(cjpeg)

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
 set(RUN_OPTIONS -b ${CMAKE_CURRENT_SOURCE_DIR}/../data/mei16v2.m2v -r -f -o0 ${CMAKE_CURRENT_BINARY_DIR}/tmp%d)
-set(PROG mpeg2decode)
 list(APPEND LDFLAGS -lm)
 set(Source display.c  gethdr.c  idct.c     mpeg2dec.c  store.c    verify.c getbits.c  getpic.c  idctref.c  recon.c     subspic.c getblk.c   getvlc.c  motion.c   spatscal.c  systems.c)
-llvm_multisource()
+llvm_multisource(mpeg2decode)

Modified: test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/nbench/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG nbench)
 list(APPEND CPPFLAGS -DBASE_ITERATIONS=25)
 list(APPEND LDFLAGS -lm)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -9,5 +8,5 @@ add_custom_command(OUTPUT ${CMAKE_CURREN
     COMMENT "Copying nbench test input")
 add_custom_target(nbench_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/NNET.DAT)
 
-llvm_multisource()
+llvm_multisource(nbench)
 add_dependencies(nbench nbench_input)

Modified: test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/sim/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,5 +1,4 @@
-set(PROG sim)
 list(APPEND CPPFLAGS -DUNIX)
 set(RUN_OPTIONS 8 ${CMAKE_CURRENT_SOURCE_DIR}/tob.38-44 ${CMAKE_CURRENT_SOURCE_DIR}/liv.42-48)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(sim)

Modified: test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,4 +1,3 @@
-set(PROG tramp3d-v4)
 list(APPEND CXXFLAGS -fno-exceptions)
 list(APPEND LDFLAGS -lstdc++)
 if(SMALL_PROBLEM_SIZE)
@@ -10,4 +9,4 @@ if("${ARCH}" STREQUAL "Mips")
 	list(APPEND CXXFLAGS -mxgot)
 endif()
 set(FP_ABSTOLERANCE 0.0000001)
-llvm_multisource()
+llvm_multisource(tramp3d-v4)

Modified: test-suite/trunk/MultiSource/Examples/Noisy/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Examples/Noisy/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Examples/Noisy/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Examples/Noisy/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG Noisy)
-llvm_multisource()
+llvm_multisource(Noisy)

Modified: test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/C%2B%2B11/frame_layout/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,3 +1,2 @@
-set(PROG frame_layout)
 list(APPEND CXXFLAGS -std=c++11)
-llvm_multisource()
+llvm_multisource(frame_layout)

Modified: test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG fp16_32_1)
-llvm_multisource()
+llvm_multisource(fp16_32_1)

Modified: test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt Thu Aug  2 16:47:23 2018
@@ -1,2 +1 @@
-set(PROG multitest)
-llvm_multisource()
+llvm_multisource(multitest)

Modified: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/SingleMultiSource.cmake?rev=338787&r1=338786&r2=338787&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Thu Aug  2 16:47:23 2018
@@ -19,8 +19,8 @@
 #   for all C/C++ files in current directory.
 #   Passes optional PREFIX parameter to llvm_test_executable().
 #
-# llvm_multisource()
-#   Invokes llvm_test_executable(${PROG} [sources...])
+# llvm_multisource(target)
+#   Invokes llvm_test_executable(${target} [sources...])
 #
 ##===----------------------------------------------------------------------===##
 
@@ -46,16 +46,15 @@ endmacro()
 # Configure the current directory as a MultiSource subdirectory - i.e. there is
 # one test and it consists of all sources in the directory (or a curated list,
 # if Source is defined).
-macro(llvm_multisource)
+macro(llvm_multisource target)
   if(DEFINED Source)
     set(sources ${Source})
   else()
     file(GLOB sources *.c *.cpp *.cc)
   endif()
 
-  llvm_test_traditional(${PROG})
-  set(_target ${PROG})
-  llvm_test_executable(${_target} ${sources})
+  llvm_test_traditional(${target})
+  llvm_test_executable(${target} ${sources})
 endmacro()
 
 # Sets Var to ${name} with directory and shortest extension removed.




More information about the llvm-commits mailing list