Index: MultiSource/Applications/Burg/CMakeLists.txt =================================================================== --- MultiSource/Applications/Burg/CMakeLists.txt +++ MultiSource/Applications/Burg/CMakeLists.txt @@ -1,8 +1,4 @@ -set(PROG burg) -list(APPEND CPPFLAGS -DDEBUG) -list(APPEND CFLAGS -std=gnu89) -list(APPEND LDFLAGS -lstdc++) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -llvm_multisource() +llvm_multisource(PROG burg CPPFLAGS -DDEBUG CFLAGS -std=gnu89 LDFLAGS -lstdc++) Index: MultiSource/Applications/aha/CMakeLists.txt =================================================================== --- MultiSource/Applications/aha/CMakeLists.txt +++ MultiSource/Applications/aha/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG aha) -llvm_multisource() +llvm_multisource(PROG aha) Index: MultiSource/Applications/d/CMakeLists.txt =================================================================== --- MultiSource/Applications/d/CMakeLists.txt +++ MultiSource/Applications/d/CMakeLists.txt @@ -1,6 +1,4 @@ -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(PROG make_dparser CPPFLAGS -DD_BUILD_VERSION=5725) Index: MultiSource/Applications/hbd/CMakeLists.txt =================================================================== --- MultiSource/Applications/hbd/CMakeLists.txt +++ MultiSource/Applications/hbd/CMakeLists.txt @@ -1,6 +1,3 @@ -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(PROG hbd CPPFLAGS -DHAVE_CONFIG_H LDFLAGS -lstdc++) Index: MultiSource/Applications/hexxagon/CMakeLists.txt =================================================================== --- MultiSource/Applications/hexxagon/CMakeLists.txt +++ MultiSource/Applications/hexxagon/CMakeLists.txt @@ -1,5 +1,3 @@ -set(PROG hexxagon) set(REQUIRES_EH_SUPPORT 1) -list(APPEND LDFLAGS -lstdc++) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input) -llvm_multisource() +llvm_multisource(PROG hexxagon LDFLAGS -lstdc++) Index: MultiSource/Applications/kimwitu++/CMakeLists.txt =================================================================== --- MultiSource/Applications/kimwitu++/CMakeLists.txt +++ MultiSource/Applications/kimwitu++/CMakeLists.txt @@ -1,7 +1,4 @@ -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(PROG kc CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DYYDEBUG=1 LDFLAGS -lstdc++) Index: MultiSource/Applications/lambda-0.1.3/CMakeLists.txt =================================================================== --- MultiSource/Applications/lambda-0.1.3/CMakeLists.txt +++ MultiSource/Applications/lambda-0.1.3/CMakeLists.txt @@ -1,5 +1,3 @@ -set(PROG lambda) -list(APPEND LDFLAGS -lstdc++) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input) set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) -llvm_multisource() +llvm_multisource(PROG lambda LDFLAGS -lstdc++) Index: MultiSource/Applications/lemon/CMakeLists.txt =================================================================== --- MultiSource/Applications/lemon/CMakeLists.txt +++ MultiSource/Applications/lemon/CMakeLists.txt @@ -1,9 +1,8 @@ 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(RUNTIMELIMIT 1500) set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ") - llvm_multisource() + llvm_multisource(PROG lemon) endif() Index: MultiSource/Applications/oggenc/CMakeLists.txt =================================================================== --- MultiSource/Applications/oggenc/CMakeLists.txt +++ MultiSource/Applications/oggenc/CMakeLists.txt @@ -1,6 +1,3 @@ -set(PROG oggenc) -list(APPEND CPPFLAGS -fno-strict-aliasing) -list(APPEND LDFLAGS -lm) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune) set(RUN_OPTIONS "-Q -s 901820 -") -llvm_multisource() +llvm_multisource(PROG oggenc CPPFLAGS -fno-strict-aliasing LDFLAGS -lm) Index: MultiSource/Applications/siod/CMakeLists.txt =================================================================== --- MultiSource/Applications/siod/CMakeLists.txt +++ MultiSource/Applications/siod/CMakeLists.txt @@ -1,6 +1,3 @@ -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) set(USE_REFERENCE_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG siod CPPFLAGS -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix LDFLAGS -lm) Index: MultiSource/Applications/treecc/CMakeLists.txt =================================================================== --- MultiSource/Applications/treecc/CMakeLists.txt +++ MultiSource/Applications/treecc/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG treecc) set(RUN_OPTIONS -n ${CMAKE_CURRENT_SOURCE_DIR}/examples/expr_cpp.tc) -llvm_multisource() +llvm_multisource(PROG treecc) Index: MultiSource/Applications/viterbi/CMakeLists.txt =================================================================== --- MultiSource/Applications/viterbi/CMakeLists.txt +++ MultiSource/Applications/viterbi/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG viterbi) -list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") -llvm_multisource() +llvm_multisource(PROG viterbi CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") Index: MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt +++ MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG IRSmk) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/irsmk_input) -llvm_multisource() +llvm_multisource(PROG IRSmk LDFLAGS -lm) Index: MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG drop3) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file) -llvm_multisource() +llvm_multisource(PROG drop3) Index: MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG five11) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file) -llvm_multisource() +llvm_multisource(PROG five11) Index: MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG uudecode) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file) -llvm_multisource() +llvm_multisource(PROG uudecode) Index: MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt +++ MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG uuencode) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt) -llvm_multisource() +llvm_multisource(PROG uuencode) Index: MultiSource/Benchmarks/Fhourstones/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Fhourstones/CMakeLists.txt +++ MultiSource/Benchmarks/Fhourstones/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG fhourstones) -list(APPEND CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input) -llvm_multisource() +llvm_multisource(PROG fhourstones CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8) Index: MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt @@ -1,5 +1,2 @@ -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(PROG espresso CPPFLAGS -DNOMEMOPT CFLAGS -std=gnu89) Index: MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt @@ -1,7 +1,4 @@ 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(PROG gawk LDFLAGS -lm CPPFLAGS -DBCOPY_MISSING -DSPRINTF_INT -DDOPRNT_MISSING -DGCVT_MISSING -DSTRCASE_MISSING -DSTRTOD_MISSING -DTMPNAM_MISSING) Index: MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt @@ -1,10 +1,5 @@ -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) -list(APPEND CPPFLAGS -DNOPRIVATE) set(Source gs.c gsmain.c gp_unix.c utrace.c) 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(PROG gs LDFLAGS -lm CPPFLAGS -DNOMEMOPT -DGS_LIB_DEFAULT="${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/fonts" -DNOPRIVATE CFLAGS -Wno-implicit-function-declaration ) Index: MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt @@ -1,5 +1,3 @@ -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(PROG make CPPFLAGS -DHAVE_SIGLIST -DNO_LDAV -DNOMEMOPT -DPOSIX) Index: MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt @@ -1,5 +1,3 @@ -set(PROG p2c) -list(APPEND CPPFLAGS -DNOMEMOPT) set(RUN_OPTIONS -v) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p) -llvm_multisource() +llvm_multisource(PROG p2c CPPFLAGS -DNOMEMOPT) Index: MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt +++ MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt @@ -1,7 +1,4 @@ -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(PROG perl CPPFLAGS -DHAS_STRERROR -DHAS_MKDIR -DHAS_RMDIR -U_POSIX_SOURCE -D__USE_MISC LDFLAGS -lm -lcrypt) Index: MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt @@ -1,6 +1,4 @@ -set(PROG qbsort) set(RUN_OPTIONS 1000) -list(APPEND LDFLAGS -lm) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG qbsort LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG testtrie) -list(APPEND LDFLAGS -lm) list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/testtrie.in2) -llvm_multisource() +llvm_multisource(PROG testtrie LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt @@ -1,5 +1,3 @@ -set(PROG bisect) -list(APPEND LDFLAGS -lm) set(FP_TOLERANCE 0.001) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in) -llvm_multisource() +llvm_multisource(PROG bisect LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG eks) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG eks LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG main) -list(APPEND LDFLAGS -lm) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG main LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG vor) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG vor LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG iotest) -llvm_multisource() +llvm_multisource(PROG iotest) Index: MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG trie) -list(APPEND LDFLAGS -lm) list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/trie.in1) -llvm_multisource() +llvm_multisource(PROG trie LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG bintr) -list(APPEND LDFLAGS -lm) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1) -llvm_multisource() +llvm_multisource(PROG bintr LDFLAGS -lm) Index: MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt +++ MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG imp) list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/sg01.imp) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG imp LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG automotive-basicmath) -list(APPEND LDFLAGS -lm) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG automotive-basicmath LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG automotive-bitcount) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS 1125000) -llvm_multisource() +llvm_multisource(PROG automotive-bitcount LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt @@ -1,5 +1,3 @@ -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(PROG automotive-susan LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt @@ -1,4 +1,2 @@ -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(PROG consumer-jpeg LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt @@ -1,6 +1,3 @@ -set(PROG consumer-lame) -list(APPEND CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav /dev/null) set(USE_REFERENCE_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG consumer-lame CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt @@ -1,6 +1,11 @@ -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(PROG consumer-typeset + 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 + LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG network-dijkstra) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.dat) -llvm_multisource() +llvm_multisource(PROG network-dijkstra LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt @@ -1,5 +1,3 @@ -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(PROG network-patricia LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt @@ -1,6 +1,3 @@ -set(PROG office-ispell) -list(APPEND CPPFLAGS -Dconst=) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.txt) -llvm_multisource() +llvm_multisource(PROG office-ispell CPPFLAGS -Dconst= LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG office-stringsearch) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG office-stringsearch LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG security-blowfish) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS print_test_data) -llvm_multisource() +llvm_multisource(PROG security-blowfish LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt @@ -1,5 +1,3 @@ -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(PROG security-rijndael LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG security-sha) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.asc ) -llvm_multisource() +llvm_multisource(PROG security-sha LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG telecomm-CRC32) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.pcm) -llvm_multisource() +llvm_multisource(PROG telecomm-CRC32 LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt @@ -1,6 +1,4 @@ -set(PROG telecomm-fft) -list(APPEND LDFLAGS -lm) set(RUN_OPTIONS 8 32768 -i) set(FP_ABSTOLERANCE 0.00001) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG telecomm-fft LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt @@ -1,5 +1,3 @@ -set(PROG telecomm-adpcm) -list(APPEND LDFLAGS -lm) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG telecomm-adpcm LDFLAGS -lm) Index: MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt +++ MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt @@ -1,6 +1,3 @@ -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(PROG telecomm-gsm CPPFLAGS -DSTUPID_COMPILER -DNeedFunctionPrototypes=1 -DSASR LDFLAGS -lm) Index: MultiSource/Benchmarks/Olden/power/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Olden/power/CMakeLists.txt +++ MultiSource/Benchmarks/Olden/power/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG power) -list(APPEND CPPFLAGS -DTORONTO) -list(APPEND LDFLAGS -lm) set(FP_TOLERANCE 0.00001) -llvm_multisource() +llvm_multisource(PROG power CPPFLAGS -DTORONTO LDFLAGS -lm) Index: MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt +++ MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt @@ -1,4 +1,2 @@ -set(PROG optimizer-eval) -list(APPEND LDFLAGS -lm) set(PROGRAM_IS_NONDETERMINISTIC 1) -llvm_multisource() +llvm_multisource(PROG optimizer-eval LDFLAGS -lm) Index: MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG np) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG np LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG city) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG city LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG deriv1) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG deriv1 LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG deriv2) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG deriv2 LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt @@ -1,6 +1,4 @@ -set(PROG employ) -list(APPEND LDFLAGS -lstdc++) set(RUN_OPTIONS 400) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.txt) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG employ LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG family) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG family LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG fsm) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG fsm LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG garage) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG garage LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG life) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG life LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG objects) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG objects LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG ocean) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG ocean LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG office) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG office LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG primes) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG primes LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG shapes) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG shapes LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG simul) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG simul LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG trees) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG trees LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG vcirc) -list(APPEND LDFLAGS -lstdc++) -llvm_multisource() +llvm_multisource(PROG vcirc LDFLAGS -lstdc++) Index: MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG timberwolfmc) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG timberwolfmc LDFLAGS -lm) Index: MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt @@ -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(PROG agrep) Index: MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG allroots) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG allroots LDFLAGS -lm) Index: MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG assembler) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG assembler LDFLAGS -lm) Index: MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG mybison) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y.in -v) -llvm_multisource() +llvm_multisource(PROG mybison) Index: MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt @@ -1,4 +1,2 @@ -list(APPEND CFLAGS -std=gnu89) -set(PROG cdecl) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/testset) -llvm_multisource() +llvm_multisource(CFLAGS -std=gnu89 PROG cdecl) Index: MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG compiler) -llvm_multisource() +llvm_multisource(PROG compiler) Index: MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG fixoutput) -llvm_multisource() +llvm_multisource(PROG fixoutput) Index: MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG football) -llvm_multisource() +llvm_multisource(PROG football) Index: MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt @@ -1,4 +1,3 @@ -set(PROG gnugo) set(HASH_PROGRAM_OUTPUT 1) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/stdin) -llvm_multisource() +llvm_multisource(PROG gnugo) Index: MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG loader) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG loader LDFLAGS -lm) Index: MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG simulator) -list(APPEND LDFLAGS -lm) -llvm_multisource() +llvm_multisource(PROG simulator LDFLAGS -lm) Index: MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt @@ -1,4 +1,3 @@ -set(PROG unix-smail) set(RUN_OPTIONS -v ALL) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/main.c) -llvm_multisource() +llvm_multisource(PROG unix-smail) Index: MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt +++ MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG unix-tbl) -llvm_multisource() +llvm_multisource(PROG unix-tbl) Index: MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt @@ -1,4 +1,3 @@ -set(PROG anagram) set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2) set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT) -llvm_multisource() +llvm_multisource(PROG anagram) Index: MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt @@ -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(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/primes.b) set(HASH_PROGRAM_OUTPUT 1) -llvm_multisource() +llvm_multisource(PROG bc) Index: MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt @@ -1,3 +1,2 @@ -set(PROG ks) list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/KL-4.in) -llvm_multisource() +llvm_multisource(PROG ks) Index: MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt +++ MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt @@ -1,5 +1,3 @@ -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(PROG yacr2 CPPFLAGS -DTODD) Index: MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG ControlFlow-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 2325 5) -llvm_multisource() +llvm_multisource(PROG ControlFlow-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG ControlLoops-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 1640 5) -llvm_multisource() +llvm_multisource(PROG ControlLoops-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG CrossingThresholds-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 5880 14) -llvm_multisource() +llvm_multisource(PROG CrossingThresholds-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG CrossingThresholds-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 5880 5) -llvm_multisource() +llvm_multisource(PROG CrossingThresholds-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Equivalencing-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 3125 14) -llvm_multisource() +llvm_multisource(PROG Equivalencing-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Equivalencing-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 3125 5) -llvm_multisource() +llvm_multisource(PROG Equivalencing-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Expansion-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 4160 5) -llvm_multisource() +llvm_multisource(PROG Expansion-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG GlobalDataFlow-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 3450 5) -llvm_multisource() +llvm_multisource(PROG GlobalDataFlow-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG IndirectAddressing-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 12500 14) -llvm_multisource() +llvm_multisource(PROG IndirectAddressing-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG IndirectAddressing-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 12500 5) -llvm_multisource() +llvm_multisource(PROG IndirectAddressing-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG InductionVariable-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 9100 5) -llvm_multisource() +llvm_multisource(PROG InductionVariable-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG LinearDependence-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 3570 5) -llvm_multisource() +llvm_multisource(PROG LinearDependence-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG LoopRerolling-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 5260 5) -llvm_multisource() +llvm_multisource(PROG LoopRerolling-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG LoopRestructuring-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 4350 14) -llvm_multisource() +llvm_multisource(PROG LoopRestructuring-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG LoopRestructuring-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 4350 5) -llvm_multisource() +llvm_multisource(PROG LoopRestructuring-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Packing-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 50000 14) -llvm_multisource() +llvm_multisource(PROG Packing-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Packing-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 50000 5) -llvm_multisource() +llvm_multisource(PROG Packing-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Recurrences-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 20000 14) -llvm_multisource() +llvm_multisource(PROG Recurrences-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Recurrences-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 20000 5) -llvm_multisource() +llvm_multisource(PROG Recurrences-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Reductions-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 1670 14) -llvm_multisource() +llvm_multisource(PROG Reductions-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Reductions-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 1670 5) -llvm_multisource() +llvm_multisource(PROG Reductions-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Searching-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 80000 14) -llvm_multisource() +llvm_multisource(PROG Searching-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Searching-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 80000 5) -llvm_multisource() +llvm_multisource(PROG Searching-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG StatementReordering-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 20000 5) -llvm_multisource() +llvm_multisource(PROG StatementReordering-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Symbolics-dbl) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 9090 14) -llvm_multisource() +llvm_multisource(PROG Symbolics-dbl LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt +++ MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt @@ -1,5 +1,2 @@ -set(PROG Symbolics-flt) -list(APPEND LDFLAGS -lm) -list(APPEND CFLAGS -std=gnu99) set(RUN_OPTIONS 9090 5) -llvm_multisource() +llvm_multisource(PROG Symbolics-flt LDFLAGS -lm CFLAGS -std=gnu99) Index: MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt @@ -1,4 +1,3 @@ set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm ) -set(PROG rawcaudio) set(Source rawcaudio.c adpcm.c) -llvm_multisource() +llvm_multisource(PROG rawcaudio) Index: MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt @@ -1,5 +1,4 @@ set(STDIN_FILENAME ${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(PROG rawdaudio) Index: MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt @@ -1,5 +1,4 @@ set(RUN_OPTIONS -4 -l) set(STDIN_FILENAME ${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(PROG encode) Index: MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt @@ -1,5 +1,3 @@ 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(PROG toast CPPFLAGS -DNeedFunctionPrototypes=1 -DSASR) Index: MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt @@ -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(PROG cjpeg) Index: MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt +++ MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt @@ -1,5 +1,3 @@ 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(PROG mpeg2decode LDFLAGS -lm) Index: MultiSource/Benchmarks/sim/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/sim/CMakeLists.txt +++ MultiSource/Benchmarks/sim/CMakeLists.txt @@ -1,5 +1,3 @@ -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(PROG sim CPPFLAGS -DUNIX) Index: MultiSource/Examples/Noisy/CMakeLists.txt =================================================================== --- MultiSource/Examples/Noisy/CMakeLists.txt +++ MultiSource/Examples/Noisy/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG Noisy) -llvm_multisource() +llvm_multisource(PROG Noisy) Index: MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt +++ MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt @@ -1,3 +1 @@ -set(PROG frame_layout) -list(APPEND CPPFLAGS -std=c++11) -llvm_multisource() +llvm_multisource(PROG frame_layout CPPFLAGS -std=c++11) Index: MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt +++ MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG fp16_32_1) -llvm_multisource() +llvm_multisource(PROG fp16_32_1) Index: MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt =================================================================== --- MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt +++ MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt @@ -1,2 +1 @@ -set(PROG multitest) -llvm_multisource() +llvm_multisource(PROG multitest)