Skip to content

Commit 32a1967

Browse files
MatzeBMatzeB
committed
cmake: Remove STDIN_FILENAME option and use shell syntax directly
llvm-svn: 338786
1 parent fd4eec0 commit 32a1967

File tree

28 files changed

+30
-45
lines changed

28 files changed

+30
-45
lines changed

‎MultiSource/Applications/ALAC/decode/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ endif()
88
list(APPEND LDFLAGS -lstdc++)
99
set(PROG alacconvert-decode)
1010
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)
11-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
12-
set(RUN_OPTIONS - -)
11+
set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
1312
llvm_multisource()

‎MultiSource/Applications/ALAC/encode/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ endif()
88
list(APPEND LDFLAGS -lstdc++)
99
set(PROG alacconvert-encode)
1010
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)
11-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
12-
set(RUN_OPTIONS - -)
11+
set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
1312
llvm_multisource()

‎MultiSource/Applications/Burg/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(PROG burg)
22
list(APPEND CPPFLAGS -DDEBUG)
33
list(APPEND CFLAGS -std=gnu89)
44
list(APPEND LDFLAGS -lstdc++)
5-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr)
5+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr)
66

77
include_directories(${CMAKE_CURRENT_BINARY_DIR})
88
llvm_multisource()

‎MultiSource/Applications/hexxagon/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(PROG hexxagon)
22
set(REQUIRES_EH_SUPPORT 1)
33
list(APPEND LDFLAGS -lstdc++)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
4+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
55
llvm_multisource()
66
target_include_directories(hexxagon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

‎MultiSource/Applications/lambda-0.1.3/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(PROG lambda)
22
list(APPEND LDFLAGS -lstdc++)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
44
set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
55
llvm_multisource()
66
target_include_directories(lambda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

‎MultiSource/Applications/obsequi/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ endif()
99
if(NOT "${ARCH}" STREQUAL "PowerPC")
1010
list(APPEND LDFLAGS -lsupc++)
1111
endif()
12-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
12+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
1313
llvm_multisource()

‎MultiSource/Applications/oggenc/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROG oggenc)
22
list(APPEND CFLAGS -fno-strict-aliasing)
33
list(APPEND LDFLAGS -lm)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune)
5-
set(RUN_OPTIONS "-Q -s 901820 -")
4+
set(RUN_OPTIONS -Q -s 901820 - < ${CMAKE_CURRENT_SOURCE_DIR}/tune)
65
llvm_multisource()

‎MultiSource/Applications/sqlite3/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
set(Source sqlite3.c shell.c)
22
set(PROG sqlite3)
33
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.)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/commands)
5-
set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory:)
4+
set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory: < ${CMAKE_CURRENT_SOURCE_DIR}/commands)
65
set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
76
set(FP_TOLERANCE 1.0e-9)
87
set(GeneratedTestInputs ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)

‎MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(PROG fhourstones3.1)
22
if(LARGE_PROBLEM_SIZE)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
44
else()
5-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs)
5+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/inputs)
66
endif()
77
if(ARCH STREQUAL "XCore")
88
set(XCORE_TARGET_NEEDS_MEMORY 64)

‎MultiSource/Benchmarks/Fhourstones/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(PROG fhourstones)
22
list(APPEND CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
44
llvm_multisource()

‎MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set(PROG p2c)
22
list(APPEND CPPFLAGS -DNOMEMOPT)
3-
set(RUN_OPTIONS -v)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p)
3+
set(RUN_OPTIONS -v < ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p)
54
llvm_multisource()

‎MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROG qbsort)
2-
set(RUN_OPTIONS 1000)
2+
set(RUN_OPTIONS 1000 < ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3)
33
list(APPEND LDFLAGS -lm)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3)
54
set(HASH_PROGRAM_OUTPUT 1)
65
llvm_multisource()

‎MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(PROG bisect)
22
list(APPEND LDFLAGS -lm)
33
set(FP_TOLERANCE 0.001)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in)
4+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in)
55
llvm_multisource()

‎MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(PROG vor)
2-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3)
2+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3)
33
list(APPEND LDFLAGS -lm)
44
llvm_multisource()

‎MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(PROG bintr)
22
list(APPEND LDFLAGS -lm)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1)
44
llvm_multisource()

‎MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROG office-ispell)
22
list(APPEND CPPFLAGS -Dconst=)
33
list(APPEND LDFLAGS -lm)
4-
set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+)
5-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
4+
set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+ < ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
65
llvm_multisource()

‎MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(PROG telecomm-adpcm)
22
list(APPEND LDFLAGS -lm)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
44
set(HASH_PROGRAM_OUTPUT 1)
55
llvm_multisource()

‎MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
set(PROG employ)
22
list(APPEND LDFLAGS -lstdc++)
3-
set(RUN_OPTIONS 400)
4-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
3+
set(RUN_OPTIONS 400 < ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
54
set(HASH_PROGRAM_OUTPUT 1)
65
llvm_multisource()

‎MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
list(APPEND CFLAGS -std=gnu89)
22
set(PROG cdecl)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/testset)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/testset)
44
llvm_multisource()

‎MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set(PROG gnugo)
22
set(HASH_PROGRAM_OUTPUT 1)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/stdin)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/stdin)
44
llvm_multisource()

‎MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
set(PROG unix-smail)
2-
set(RUN_OPTIONS -v ALL)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
2+
set(RUN_OPTIONS -v ALL < ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
43
llvm_multisource()

‎MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
set(PROG anagram)
2-
set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT)
2+
set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2 < ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT)
43
llvm_multisource()

‎MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(PROG bc)
22
set(OBJS scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o)
3-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/primes.b)
3+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/primes.b)
44
set(HASH_PROGRAM_OUTPUT 1)
55
llvm_multisource()

‎MultiSource/Benchmarks/mafft/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ set(Source Calignm1.c constants.c defs.c Falign.c fft.c fftFunctions.c Galign11.
22
set(PROG pairlocalalign)
33
list(APPEND CPPFLAGS -DLLVM)
44
list(APPEND LDFLAGS -lm)
5-
set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L)
5+
set(RUN_OPTIONS -b 62 -g 0.100 -f 2.00 -h 0.100 -L < ${CMAKE_CURRENT_SOURCE_DIR}/pyruvate_decarboxylase.fasta)
66
set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
7-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/pyruvate_decarboxylase.fasta)
87
set(HASH_PROGRAM_OUTPUT 1)
98
if(ARCH STREQUAL "XCore")
109
set(XCORE_TARGET_NEEDS_MEMORY 256)

‎MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm )
1+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm )
22
set(PROG rawcaudio)
33
set(Source rawcaudio.c adpcm.c)
44
llvm_multisource()

‎MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm )
1+
set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm )
22
set(PROG rawdaudio)
33
set(HASH_PROGRAM_OUTPUT 1)
44
set(Source rawdaudio.c adpcm.c)

‎MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
set(RUN_OPTIONS -4 -l)
2-
set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
1+
set(RUN_OPTIONS -4 -l < ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
32
set(PROG encode)
43
set(Source encode.c g711.c g721.c g723_24.c g723_40.c g72x.c)
54
llvm_multisource()

‎cmake/modules/SingleMultiSource.cmake

+2-5
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,10 @@ macro(basename Var name)
6666
string(REGEX REPLACE "\\.[^.]*$" "" ${Var} ${_filename})
6767
endmacro()
6868

69-
# Traditionally CMakeLists.txt files would set RUN_OPTIONS, STDIN_FILENAME,
70-
# SMALL_PROBLEM_SIZE, HASH_PROGRAM_OUTPUT, etc.
69+
# Traditionally CMakeLists.txt files would set RUN_OPTIONS, SMALL_PROBLEM_SIZE,
70+
# HASH_PROGRAM_OUTPUT, etc.
7171
# Create llvm_test_run() and llvm_test_verify() invocation for that.
7272
function(llvm_test_traditional name)
73-
if(STDIN_FILENAME)
74-
list(APPEND RUN_OPTIONS "< ${STDIN_FILENAME}")
75-
endif()
7673
if(WORKDIR)
7774
list(APPEND RUN_OPTIONS WORKDIR ${WORKDIR})
7875
endif()

0 commit comments

Comments
 (0)