[test-suite] r286143 - cmake: Remove custom llvm_add_subdirectories() usage; NFC
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 7 12:41:28 PST 2016
Author: matze
Date: Mon Nov 7 14:41:28 2016
New Revision: 286143
URL: http://llvm.org/viewvc/llvm-project?rev=286143&view=rev
Log:
cmake: Remove custom llvm_add_subdirectories() usage; NFC
- People familiar with cmake already know add_subdirectory() so they do
not need lookup whether llvm_add_subdirectories() has additional
semantics.
- Replacing one-line lists with list over multiple lines sorted in
alphabetical order is merge friendly.
Removed:
test-suite/trunk/cmake/modules/MakefileFunctions.cmake
Modified:
test-suite/trunk/Bitcode/CMakeLists.txt
test-suite/trunk/CMakeLists.txt
test-suite/trunk/External/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt
test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt
test-suite/trunk/External/SPEC/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/CMakeLists.txt
test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
test-suite/trunk/MultiSource/CMakeLists.txt
test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt
test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt
test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt
test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
test-suite/trunk/SingleSource/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt
Modified: test-suite/trunk/Bitcode/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -8,11 +8,11 @@ endif()
set(TEST_SUITE_ENABLE_BITCODE_TESTS ${ENABLE_BITCODE_DEFAULT} CACHE BOOL "Enable bitcode tests")
if(TEST_SUITE_ENABLE_BITCODE_TESTS)
- llvm_add_subdirectories(Benchmarks)
+ add_subdirectory(Benchmarks)
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(Regression)
+ add_subdirectory(Regression)
if(ARCH STREQUAL "x86" OR ARCH STREQUAL "AArch64" OR ARCH STREQUAL "ARM")
- llvm_add_subdirectories(simd_ops)
+ add_subdirectory(simd_ops)
endif()
endif()
endif()
Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -118,7 +118,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
set(CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_DIAGNOSE_LINKER_FLAGS}")
-include(MakefileFunctions)
include(SingleMultiSource)
find_package(TCL)
Modified: test-suite/trunk/External/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/CMakeLists.txt (original)
+++ test-suite/trunk/External/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -22,11 +22,9 @@ macro(llvm_externals_find PATHVAR NAME D
endif()
endmacro()
-llvm_add_subdirectories(
- CUDA
- HMMER
- Nurbs
- Povray
- SPEC
- skidmarks10
-)
+add_subdirectory(CUDA)
+add_subdirectory(HMMER)
+add_subdirectory(Nurbs)
+add_subdirectory(Povray)
+add_subdirectory(SPEC)
+add_subdirectory(skidmarks10)
Modified: test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -4,18 +4,14 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND CPPFLAGS -DSPEC_CPU2000_LP64)
endif()
-macro(cfp2000_subdir)
- foreach(BENCHMARK ${ARGN})
- set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CFP2000/${BENCHMARK})
- set(PROG ${BENCHMARK})
- file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
- llvm_add_subdirectories(${BENCHMARK})
- endforeach()
+macro(cfp2000_subdir BENCHMARK)
+ set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CFP2000/${BENCHMARK})
+ set(PROG ${BENCHMARK})
+ file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
+ add_subdirectory(${BENCHMARK})
endmacro()
-cfp2000_subdir(
- 177.mesa
- 179.art
- 183.equake
- 188.ammp
-)
+cfp2000_subdir(177.mesa)
+cfp2000_subdir(179.art)
+cfp2000_subdir(183.equake)
+cfp2000_subdir(188.ammp)
Modified: test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2006/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -26,21 +26,17 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND CPPFLAGS -DSPEC_CPU_LP64)
endif()
-macro(cpu2006_subdir)
- foreach(BENCHMARK ${ARGN})
- set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
- set(PROG ${BENCHMARK})
- file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp ${BENCHMARK_DIR}/src/*.cc)
- llvm_add_subdirectories(${BENCHMARK})
- endforeach()
+macro(cpu2006_subdir BENCHMARK)
+ set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
+ set(PROG ${BENCHMARK})
+ file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp ${BENCHMARK_DIR}/src/*.cc)
+ add_subdirectory(${BENCHMARK})
endmacro()
-cpu2006_subdir(
- 433.milc
- 444.namd
- 447.dealII
- 450.soplex
- 453.povray
- 470.lbm
- 482.sphinx3
-)
+cpu2006_subdir(433.milc)
+cpu2006_subdir(444.namd)
+cpu2006_subdir(447.dealII)
+cpu2006_subdir(450.soplex)
+cpu2006_subdir(453.povray)
+cpu2006_subdir(470.lbm)
+cpu2006_subdir(482.sphinx3)
Modified: test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -3,26 +3,22 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND CPPFLAGS -DSPEC_CPU2000_LP64)
endif()
-macro(cint2000_subdir)
- foreach(BENCHMARK ${ARGN})
- set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CINT2000/${BENCHMARK})
- set(PROG ${BENCHMARK})
- file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
- llvm_add_subdirectories(${BENCHMARK})
- endforeach()
+macro(cint2000_subdir BENCHMARK)
+ set(BENCHMARK_DIR ${TEST_SUITE_SPEC2000_ROOT}/benchspec/CINT2000/${BENCHMARK})
+ set(PROG ${BENCHMARK})
+ file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
+ add_subdirectory(${BENCHMARK})
endmacro()
-cint2000_subdir(
- 164.gzip
- 175.vpr
- 176.gcc
- 181.mcf
- 186.crafty
- 197.parser
- 252.eon
- 253.perlbmk
- 254.gap
- 255.vortex
- 256.bzip2
- 300.twolf
-)
+cint2000_subdir(164.gzip)
+cint2000_subdir(175.vpr)
+cint2000_subdir(176.gcc)
+cint2000_subdir(181.mcf)
+cint2000_subdir(186.crafty)
+cint2000_subdir(197.parser)
+cint2000_subdir(252.eon)
+cint2000_subdir(253.perlbmk)
+cint2000_subdir(254.gap)
+cint2000_subdir(255.vortex)
+cint2000_subdir(256.bzip2)
+cint2000_subdir(300.twolf)
Modified: test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -26,26 +26,22 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND CPPFLAGS -DSPEC_CPU_LP64)
endif()
-macro(cpu2006_subdir)
- foreach(BENCHMARK ${ARGN})
- set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
- set(PROG ${BENCHMARK})
- file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
- llvm_add_subdirectories(${BENCHMARK})
- endforeach()
+macro(cpu2006_subdir BENCHMARK)
+ set(BENCHMARK_DIR ${TEST_SUITE_SPEC2006_ROOT}/benchspec/CPU2006/${BENCHMARK})
+ set(PROG ${BENCHMARK})
+ file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
+ add_subdirectory(${BENCHMARK})
endmacro()
-cpu2006_subdir(
- 400.perlbench
- 401.bzip2
- 403.gcc
- 429.mcf
- 445.gobmk
- 456.hmmer
- 458.sjeng
- 462.libquantum
- 464.h264ref
- 471.omnetpp
- 473.astar
- 483.xalancbmk
-)
+cpu2006_subdir(400.perlbench)
+cpu2006_subdir(401.bzip2)
+cpu2006_subdir(403.gcc)
+cpu2006_subdir(429.mcf)
+cpu2006_subdir(445.gobmk)
+cpu2006_subdir(456.hmmer)
+cpu2006_subdir(458.sjeng)
+cpu2006_subdir(462.libquantum)
+cpu2006_subdir(464.h264ref)
+cpu2006_subdir(471.omnetpp)
+cpu2006_subdir(473.astar)
+cpu2006_subdir(483.xalancbmk)
Modified: test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT95/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,21 +1,17 @@
list(APPEND CPPFLAGS -DSPEC_CPU95)
-macro(cint95_subdir)
- foreach(BENCHMARK ${ARGN})
- set(BENCHMARK_DIR ${TEST_SUITE_SPEC95_ROOT}/benchspec/CINT95/${BENCHMARK})
- set(PROG ${BENCHMARK})
- file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
- llvm_add_subdirectories(${BENCHMARK})
- endforeach()
+macro(cint95_subdir BENCHMARK)
+ set(BENCHMARK_DIR ${TEST_SUITE_SPEC95_ROOT}/benchspec/CINT95/${BENCHMARK})
+ set(PROG ${BENCHMARK})
+ file(GLOB Source ${BENCHMARK_DIR}/src/*.c ${BENCHMARK_DIR}/src/*.cpp)
+ add_subdirectory(${BENCHMARK})
endmacro()
-cint95_subdir(
- 099.go
- 124.m88ksim
- # 126.gcc # uses nonstandard lvalue casts which clang doesn't support
- 129.compress
- 130.li
- 132.ijpeg
- 134.perl
- 147.vortex
-)
+cint95_subdir(099.go)
+cint95_subdir(124.m88ksim)
+#cint95_subdir(126.gcc) # uses nonstandard lvalue casts (without clang support)
+cint95_subdir(129.compress)
+cint95_subdir(130.li)
+cint95_subdir(132.ijpeg)
+cint95_subdir(134.perl)
+cint95_subdir(147.vortex)
Modified: test-suite/trunk/External/SPEC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -13,18 +13,20 @@ endif()
llvm_externals_find(TEST_SUITE_SPEC95_ROOT "spec95" "SPEC CPU95")
if(TEST_SUITE_SPEC95_ROOT)
- llvm_add_subdirectories(CINT95)
- # Note that CFP95 tests are all fortran so not supported by cmake/lit yet
+ add_subdirectory(CINT95)
+ # Note that all CFP95 tests are fortran so not supported by cmake/lit yet
endif()
llvm_externals_find(TEST_SUITE_SPEC2000_ROOT "speccpu2000" "SPEC CPU2000")
if(TEST_SUITE_SPEC2000_ROOT)
- llvm_add_subdirectories(CFP2000 CINT2000)
+ add_subdirectory(CFP2000)
+ add_subdirectory(CINT2000)
endif()
llvm_externals_find(TEST_SUITE_SPEC2006_ROOT "speccpu2006" "SPEC CPU2006")
if(TEST_SUITE_SPEC2006_ROOT)
- llvm_add_subdirectories(CINT2006 CFP2006)
+ add_subdirectory(CINT2006)
+ add_subdirectory(CFP2006)
endif()
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Modified: test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ALAC/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(encode decode)
+add_subdirectory(encode)
+add_subdirectory(decode)
Modified: test-suite/trunk/MultiSource/Applications/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,30 +1,44 @@
-llvm_add_subdirectories(aha sgefa d spiff oggenc JM viterbi SIBsim4)
+add_subdirectory(JM)
+add_subdirectory(SIBsim4)
+add_subdirectory(aha)
+add_subdirectory(d)
+add_subdirectory(oggenc)
+add_subdirectory(sgefa)
+add_subdirectory(spiff)
+add_subdirectory(viterbi)
+
if(NOT DEFINED DISABLE_CXX)
- llvm_add_subdirectories(lambda-0.1.3 hbd minisat ALAC)
+ add_subdirectory(ALAC)
+ add_subdirectory(hbd)
+ add_subdirectory(lambda-0.1.3)
+ add_subdirectory(minisat)
if(NOT TARGET_OS STREQUAL "SunOS")
- llvm_add_subdirectories(hexxagon)
+ add_subdirectory(hexxagon)
endif()
endif()
if(NOT DEFINED SMALL_PROBLEM_SIZE)
- llvm_add_subdirectories(lua)
+ add_subdirectory(lua)
endif()
if(TARGET_OS STREQUAL "Linux" AND (NOT ARCH STREQUAL "XCore"))
- llvm_add_subdirectories(obsequi)
+ add_subdirectory(obsequi)
endif()
if(NOT TARGET_OS STREQUAL "SunOS")
if(NOT DEFINED DISABLE_CXX)
- llvm_add_subdirectories(kimwitu++)
+ add_subdirectory(kimwitu++)
endif()
endif()
if(NOT TARGET_OS STREQUAL "SunOS")
- llvm_add_subdirectories(SPASS)
+ add_subdirectory(SPASS)
endif()
if(NOT ARCH STREQUAL "XCore")
- llvm_add_subdirectories(siod ClamAV lemon)
+ add_subdirectory(ClamAV)
+ add_subdirectory(lemon)
+ add_subdirectory(siod)
endif()
if((NOT ARCH STREQUAL "PowerPC") AND (NOT ARCH STREQUAL "XCore"))
- llvm_add_subdirectories(sqlite3)
+ add_subdirectory(sqlite3)
endif()
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(Burg treecc)
+ add_subdirectory(Burg)
+ add_subdirectory(treecc)
endif()
Modified: test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/JM/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(ldecod lencod)
+add_subdirectory(ldecod)
+add_subdirectory(lencod)
Modified: test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1 @@
-llvm_add_subdirectories(SMG2000)
+add_subdirectory(SMG2000)
Modified: test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,3 @@
-llvm_add_subdirectories(IRSmk AMGmk CrystalMk)
+add_subdirectory(AMGmk)
+add_subdirectory(CrystalMk)
+add_subdirectory(IRSmk)
Modified: test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/BitBench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,4 @@
-llvm_add_subdirectories(five11 drop3 uudecode uuencode)
+add_subdirectory(drop3)
+add_subdirectory(five11)
+add_subdirectory(uudecode)
+add_subdirectory(uuencode)
Modified: test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,13 +1,36 @@
-llvm_add_subdirectories(Fhourstones Fhourstones-3.1 McCat Olden Ptrdist llubenchmark sim FreeBench MallocBench Prolangs-C SciMark2-C mediabench nbench ASCI_Purple MiBench Trimaran VersaBench NPB-serial BitBench ASC_Sequoia)
+add_subdirectory(ASCI_Purple)
+add_subdirectory(ASC_Sequoia)
+add_subdirectory(BitBench)
+add_subdirectory(Fhourstones)
+add_subdirectory(Fhourstones-3.1)
+add_subdirectory(FreeBench)
+add_subdirectory(MallocBench)
+add_subdirectory(McCat)
+add_subdirectory(MiBench)
+add_subdirectory(NPB-serial)
+add_subdirectory(Olden)
+add_subdirectory(Prolangs-C)
+add_subdirectory(Ptrdist)
+add_subdirectory(SciMark2-C)
+add_subdirectory(Trimaran)
+add_subdirectory(VersaBench)
+add_subdirectory(llubenchmark)
+add_subdirectory(mediabench)
+add_subdirectory(nbench)
+add_subdirectory(sim)
+
if((NOT "${TARGET_OS}" STREQUAL "Darwin") OR (NOT "${ARCH}" STREQUAL "ARM"))
- llvm_add_subdirectories(TSVC)
+ add_subdirectory(TSVC)
endif()
if(NOT DEFINED DISABLE_CXX)
- llvm_add_subdirectories(Prolangs-C++ Bullet tramp3d-v4)
+ add_subdirectory(Prolangs-C++)
+ add_subdirectory(Bullet)
+ add_subdirectory(tramp3d-v4)
if(NOT "${ARCH}" STREQUAL "XCore")
- llvm_add_subdirectories(7zip PAQ8p)
+ add_subdirectory(7zip)
+ add_subdirectory(PAQ8p)
endif()
endif()
if(NOT DEFINED SMALL_PROBLEM_SIZE)
- llvm_add_subdirectories(mafft)
+ add_subdirectory(mafft)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/FreeBench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,9 @@
-llvm_add_subdirectories(distray mason pcompress2 fourinarow neural pifft)
+add_subdirectory(distray)
+add_subdirectory(fourinarow)
+add_subdirectory(mason)
+add_subdirectory(neural)
+add_subdirectory(pcompress2)
+add_subdirectory(pifft)
if(NOT "${ARCH}" STREQUAL "Sparc")
- llvm_add_subdirectories(analyzer)
+ add_subdirectory(analyzer)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,5 @@
-llvm_add_subdirectories(espresso gs)
+add_subdirectory(espresso)
+add_subdirectory(gs)
if(NOT "${ARCH}" STREQUAL "Alpha")
- llvm_add_subdirectories(cfrac)
+ add_subdirectory(cfrac)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,12 @@
-llvm_add_subdirectories(01-qbsort 04-bisect 08-main 12-IOtest 17-bintr 03-testtrie 05-eks 09-vor 18-imp)
+add_subdirectory(01-qbsort)
+add_subdirectory(03-testtrie)
+add_subdirectory(04-bisect)
+add_subdirectory(05-eks)
+add_subdirectory(08-main)
+add_subdirectory(09-vor)
+add_subdirectory(12-IOtest)
+add_subdirectory(17-bintr)
+add_subdirectory(18-imp)
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(15-trie)
+ add_subdirectory(15-trie)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,10 +1,23 @@
-llvm_add_subdirectories(automotive-basicmath automotive-bitcount automotive-susan consumer-jpeg consumer-typeset network-dijkstra network-patricia security-rijndael security-sha telecomm-CRC32 telecomm-FFT telecomm-gsm)
+add_subdirectory(automotive-basicmath)
+add_subdirectory(automotive-bitcount)
+add_subdirectory(automotive-susan)
+add_subdirectory(consumer-jpeg)
+add_subdirectory(consumer-typeset)
+add_subdirectory(network-dijkstra)
+add_subdirectory(network-patricia)
+add_subdirectory(security-rijndael)
+add_subdirectory(security-sha)
+add_subdirectory(telecomm-CRC32)
+add_subdirectory(telecomm-FFT)
+add_subdirectory(telecomm-gsm)
if(NOT "${ARCH}" STREQUAL "XCore")
- llvm_add_subdirectories(consumer-lame)
+ add_subdirectory(consumer-lame)
endif()
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(office-stringsearch security-blowfish telecomm-adpcm)
+ add_subdirectory(office-stringsearch)
+ add_subdirectory(security-blowfish)
+ add_subdirectory(telecomm-adpcm)
if((NOT "${ARCH}" STREQUAL "XCore") AND (NOT "${ARCH}" STREQUAL "ARM"))
- llvm_add_subdirectories(office-ispell)
+ add_subdirectory(office-ispell)
endif()
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1 @@
-llvm_add_subdirectories(is)
+add_subdirectory(is)
Modified: test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Olden/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,10 @@
-llvm_add_subdirectories(bh em3d mst power tsp bisort health perimeter treeadd voronoi)
+add_subdirectory(bh)
+add_subdirectory(bisort)
+add_subdirectory(em3d)
+add_subdirectory(health)
+add_subdirectory(mst)
+add_subdirectory(perimeter)
+add_subdirectory(power)
+add_subdirectory(treeadd)
+add_subdirectory(tsp)
+add_subdirectory(voronoi)
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C%2B%2B/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,19 @@
-llvm_add_subdirectories(city employ life ocean primes simul)
+add_subdirectory(city)
+add_subdirectory(employ)
+add_subdirectory(life)
+add_subdirectory(ocean)
+add_subdirectory(primes)
+add_subdirectory(simul)
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(deriv1 deriv2 family fsm garage NP objects office shapes trees vcirc)
+ add_subdirectory(NP)
+ add_subdirectory(deriv1)
+ add_subdirectory(deriv2)
+ add_subdirectory(family)
+ add_subdirectory(fsm)
+ add_subdirectory(garage)
+ add_subdirectory(objects)
+ add_subdirectory(office)
+ add_subdirectory(shapes)
+ add_subdirectory(trees)
+ add_subdirectory(vcirc)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,10 +1,22 @@
-llvm_add_subdirectories(agrep gnugo)
+add_subdirectory(agrep)
+add_subdirectory(gnugo)
if((NOT "${ARCH}" STREQUAL "Sparc") AND (NOT "${ARCH}" STREQUAL "Alpha"))
- llvm_add_subdirectories(bison)
+ add_subdirectory(bison)
endif()
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(allroots assembler cdecl compiler loader fixoutput football plot2fig simulator TimberWolfMC unix-tbl)
+ add_subdirectory(TimberWolfMC)
+ add_subdirectory(allroots)
+ add_subdirectory(assembler)
+ add_subdirectory(cdecl)
+ add_subdirectory(compiler)
+ add_subdirectory(fixoutput)
+ add_subdirectory(football)
+ add_subdirectory(loader)
+ add_subdirectory(plot2fig)
+ add_subdirectory(simulator)
+ add_subdirectory(unix-tbl)
if(NOT "${ARCH}" STREQUAL "XCore")
- llvm_add_subdirectories(archie-client unix-smail)
+ add_subdirectory(archie-client)
+ add_subdirectory(unix-smail)
endif()
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,5 @@
-llvm_add_subdirectories(anagram bc ft ks yacr2)
+add_subdirectory(anagram)
+add_subdirectory(bc)
+add_subdirectory(ft)
+add_subdirectory(ks)
+add_subdirectory(yacr2)
Modified: test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,36 @@
-llvm_add_subdirectories(LinearDependence-flt InductionVariable-flt GlobalDataFlow-flt ControlFlow-flt Symbolics-flt StatementReordering-flt LoopRestructuring-flt NodeSplitting-flt Expansion-flt CrossingThresholds-flt Reductions-flt Recurrences-flt Searching-flt Packing-flt LoopRerolling-flt Equivalencing-flt IndirectAddressing-flt ControlLoops-flt LinearDependence-dbl InductionVariable-dbl GlobalDataFlow-dbl ControlFlow-dbl Symbolics-dbl StatementReordering-dbl LoopRestructuring-dbl NodeSplitting-dbl Expansion-dbl CrossingThresholds-dbl Reductions-dbl Recurrences-dbl Searching-dbl Packing-dbl LoopRerolling-dbl Equivalencing-dbl IndirectAddressing-dbl ControlLoops-dbl)
+add_subdirectory(ControlFlow-dbl)
+add_subdirectory(ControlFlow-flt)
+add_subdirectory(ControlLoops-dbl)
+add_subdirectory(ControlLoops-flt)
+add_subdirectory(CrossingThresholds-dbl)
+add_subdirectory(CrossingThresholds-flt)
+add_subdirectory(Equivalencing-dbl)
+add_subdirectory(Equivalencing-flt)
+add_subdirectory(Expansion-dbl)
+add_subdirectory(Expansion-flt)
+add_subdirectory(GlobalDataFlow-dbl)
+add_subdirectory(GlobalDataFlow-flt)
+add_subdirectory(IndirectAddressing-dbl)
+add_subdirectory(IndirectAddressing-flt)
+add_subdirectory(InductionVariable-dbl)
+add_subdirectory(InductionVariable-flt)
+add_subdirectory(LinearDependence-dbl)
+add_subdirectory(LinearDependence-flt)
+add_subdirectory(LoopRerolling-dbl)
+add_subdirectory(LoopRerolling-flt)
+add_subdirectory(LoopRestructuring-dbl)
+add_subdirectory(LoopRestructuring-flt)
+add_subdirectory(NodeSplitting-dbl)
+add_subdirectory(NodeSplitting-flt)
+add_subdirectory(Packing-dbl)
+add_subdirectory(Packing-flt)
+add_subdirectory(Recurrences-dbl)
+add_subdirectory(Recurrences-flt)
+add_subdirectory(Reductions-dbl)
+add_subdirectory(Reductions-flt)
+add_subdirectory(Searching-dbl)
+add_subdirectory(Searching-flt)
+add_subdirectory(StatementReordering-dbl)
+add_subdirectory(StatementReordering-flt)
+add_subdirectory(Symbolics-dbl)
+add_subdirectory(Symbolics-flt)
Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,6 @@
-llvm_add_subdirectories(enc-3des enc-md5 enc-pc1 enc-rc4 netbench-crc netbench-url)
+add_subdirectory(enc-3des)
+add_subdirectory(enc-md5)
+add_subdirectory(enc-pc1)
+add_subdirectory(enc-rc4)
+add_subdirectory(netbench-crc)
+add_subdirectory(netbench-url)
Modified: test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/VersaBench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,7 @@
-llvm_add_subdirectories(beamformer bmm dbms ecbdes)
+add_subdirectory(beamformer)
+add_subdirectory(bmm)
+add_subdirectory(dbms)
+add_subdirectory(ecbdes)
if(NOT "${ENDIAN}" STREQUAL "big")
- llvm_add_subdirectories(8b10b)
+ add_subdirectory(8b10b)
endif()
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,5 @@
-llvm_add_subdirectories(adpcm g721 gsm jpeg mpeg2)
+add_subdirectory(adpcm)
+add_subdirectory(g721)
+add_subdirectory(gsm)
+add_subdirectory(jpeg)
+add_subdirectory(mpeg2)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(rawcaudio rawdaudio)
+add_subdirectory(rawcaudio)
+add_subdirectory(rawdaudio)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1 @@
-llvm_add_subdirectories(g721encode)
+add_subdirectory(g721encode)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1 @@
-llvm_add_subdirectories(toast)
+add_subdirectory(toast)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1 @@
-llvm_add_subdirectories(jpeg-6a)
+add_subdirectory(jpeg-6a)
Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1 @@
-llvm_add_subdirectories(mpeg2dec)
+add_subdirectory(mpeg2dec)
Modified: test-suite/trunk/MultiSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,5 @@
-llvm_add_subdirectories(Applications Benchmarks)
+add_subdirectory(Applications)
+add_subdirectory(Benchmarks)
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(UnitTests)
+ add_subdirectory(UnitTests)
endif()
Modified: test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/C%2B%2B11/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/C++11/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,5 +1,5 @@
list(APPEND CPPFLAGS -std=c++11)
if(NOT MIPS_IS_MIPS16_ENABLED)
- llvm_add_subdirectories(frame_layout)
+ add_subdirectory(frame_layout)
endif()
Modified: test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,4 @@
-llvm_add_subdirectories(C++11)
+add_subdirectory(C++11)
if(ARCH STREQUAL "Mips")
- llvm_add_subdirectories(Mips)
+ add_subdirectory(Mips)
endif()
Modified: test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/Mips/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,3 +1,3 @@
if(MIPS_IS_MIPS16_ENABLED)
- llvm_add_subdirectories(Mips16)
+ add_subdirectory(Mips16)
endif()
Modified: test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(multitest fp16_32_1)
+add_subdirectory(fp16_32_1)
+add_subdirectory(multitest)
Modified: test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,4 @@
-llvm_add_subdirectories(Large)
+add_subdirectory(Large)
list(APPEND LDFLAGS -lm)
llvm_singlesource()
Modified: test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,14 @@
-llvm_add_subdirectories(Dhrystone CoyoteBench Shootout Shootout-C++ Stanford McGill Misc Misc-C++ Misc-C++-EH BenchmarkGame Adobe-C++ Polybench Linpack SmallPT)
+add_subdirectory(Adobe-C++)
+add_subdirectory(BenchmarkGame)
+add_subdirectory(CoyoteBench)
+add_subdirectory(Dhrystone)
+add_subdirectory(Linpack)
+add_subdirectory(McGill)
+add_subdirectory(Misc)
+add_subdirectory(Misc-C++)
+add_subdirectory(Misc-C++-EH)
+add_subdirectory(Polybench)
+add_subdirectory(Shootout)
+add_subdirectory(Shootout-C++)
+add_subdirectory(SmallPT)
+add_subdirectory(Stanford)
Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,4 @@
-llvm_add_subdirectories(Large)
+add_subdirectory(Large)
list(APPEND LDFLAGS -lm -lstdc++)
set(FP_ABSTOLERANCE 0.01)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,2 +1,5 @@
list(APPEND LDFLAGS -lm)
-llvm_add_subdirectories(datamining linear-algebra medley stencils)
+add_subdirectory(datamining)
+add_subdirectory(linear-algebra)
+add_subdirectory(medley)
+add_subdirectory(stencils)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(correlation covariance)
+add_subdirectory(correlation)
+add_subdirectory(covariance)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(kernels solvers)
+add_subdirectory(kernels)
+add_subdirectory(solvers)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,17 @@
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(2mm 3mm gemm)
+ add_subdirectory(2mm)
+ add_subdirectory(3mm)
+ add_subdirectory(gemm)
endif()
-llvm_add_subdirectories(atax bicg cholesky doitgen gemver gesummv mvt symm syr2k syrk trisolv trmm)
+add_subdirectory(atax)
+add_subdirectory(bicg)
+add_subdirectory(cholesky)
+add_subdirectory(doitgen)
+add_subdirectory(gemver)
+add_subdirectory(gesummv)
+add_subdirectory(mvt)
+add_subdirectory(symm)
+add_subdirectory(syr2k)
+add_subdirectory(syrk)
+add_subdirectory(trisolv)
+add_subdirectory(trmm)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,4 @@
-llvm_add_subdirectories(durbin dynprog gramschmidt lu)
+add_subdirectory(durbin)
+add_subdirectory(dynprog)
+add_subdirectory(gramschmidt)
+add_subdirectory(lu)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(floyd-warshall reg_detect)
+add_subdirectory(floyd-warshall)
+add_subdirectory(reg_detect)
Modified: test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,6 @@
-llvm_add_subdirectories(adi fdtd-2d fdtd-apml jacobi-1d-imper jacobi-2d-imper seidel-2d)
+add_subdirectory(adi)
+add_subdirectory(fdtd-2d)
+add_subdirectory(fdtd-apml)
+add_subdirectory(jacobi-1d-imper)
+add_subdirectory(jacobi-2d-imper)
+add_subdirectory(seidel-2d)
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,4 @@
-llvm_add_subdirectories(EH)
+add_subdirectory(EH)
list(APPEND CXXFLAGS -Wno-deprecated)
list(APPEND CPPFLAGS -Wno-deprecated)
Modified: test-suite/trunk/SingleSource/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,6 +1,7 @@
-llvm_add_subdirectories(Benchmarks)
+add_subdirectory(Benchmarks)
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
- llvm_add_subdirectories(UnitTests Regression)
+ add_subdirectory(UnitTests)
+ add_subdirectory(Regression)
endif()
file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
Modified: test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,4 @@
-llvm_add_subdirectories(EH)
+add_subdirectory(EH)
list(APPEND LDFLAGS -lstdc++)
llvm_singlesource(PREFIX "regression-cxx")
Modified: test-suite/trunk/SingleSource/Regression/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(C++ C)
+add_subdirectory(C)
+add_subdirectory(C++)
Modified: test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,10 +1,15 @@
-llvm_add_subdirectories(Vector Vectorizer SignlessTypes Threads C++11)
+add_subdirectory(C++11)
+add_subdirectory(SignlessTypes)
+add_subdirectory(Threads)
+add_subdirectory(Vector)
+add_subdirectory(Vectorizer)
# FIXME: Disable SJLJ tests for now, until EH edges are represented.
-# llvm_add_subdirectories(SetjmpLongjmp)
+# add_subdirectory(SetjmpLongjmp)
if(TARGET_OS STREQUAL "Darwin")
- llvm_add_subdirectories(ObjC ObjC++)
+ add_subdirectory(ObjC)
+ add_subdirectory(ObjC++)
endif()
if(TARGET_OS STREQUAL "Darwin")
set(PROGRAMS_TO_SKIP 2007-04-25-weak)
@@ -16,7 +21,7 @@ if(ARCH STREQUAL "AArch64")
list(APPEND PROGRAMS_TO_SKIP blockstret)
endif()
if(ARCH STREQUAL "Mips")
- llvm_add_subdirectories(Mips)
+ add_subdirectory(Mips)
# Only MIPS 64-bit supports 8 bytes atomic operations.
if(NOT MIPS_IS_MIPS64_ENABLED)
list(APPEND PROGRAMS_TO_SKIP AtomicOps)
Modified: test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Mips/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,3 +1,3 @@
if(MIPS_IS_MIPS16_ENABLED)
- llvm_add_subdirectories(Mips16)
+ add_subdirectory(Mips16)
endif()
Modified: test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1 +1,2 @@
-llvm_add_subdirectories(C C++)
+add_subdirectory(C)
+add_subdirectory(C++)
Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,4 +1,4 @@
-llvm_add_subdirectories(Large)
+add_subdirectory(Large)
execute_process(COMMAND date +%j OUTPUT_VARIABLE TMP1)
set(SEED TMP1)
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt?rev=286143&r1=286142&r2=286143&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt Mon Nov 7 14:41:28 2016
@@ -1,14 +1,15 @@
if(ARCH STREQUAL "PowerPC")
- llvm_add_subdirectories(Altivec)
+ add_subdirectory(Altivec)
endif()
if(ARCH STREQUAL "x86")
- llvm_add_subdirectories(SSE)
+ add_subdirectory(SSE)
endif()
if(NOT "${CC_UNDER_TEST_TARGET_IS_THUMBV7}" STREQUAL "")
- llvm_add_subdirectories(NEON)
+ add_subdirectory(NEON)
endif()
if(ARCH STREQUAL "AArch64")
- llvm_add_subdirectories(NEON AArch64)
+ add_subdirectory(NEON)
+ add_subdirectory(AArch64)
endif()
if(NOT DEFINED CC_UNDER_TEST_IS_CLANG)
set(PROGRAMS_TO_SKIP constpool)
Removed: test-suite/trunk/cmake/modules/MakefileFunctions.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/MakefileFunctions.cmake?rev=286142&view=auto
==============================================================================
--- test-suite/trunk/cmake/modules/MakefileFunctions.cmake (original)
+++ test-suite/trunk/cmake/modules/MakefileFunctions.cmake (removed)
@@ -1,15 +0,0 @@
-##===- MakefileFunctions.cmake --------------------------------------------===##
-#
-# Defines functions used within subdirectory CMakeLists.txt, that look a bit
-# like standard GNU Make functions. These support the auto-generation of
-# CMakeLists.txt from Makefiles, although any use of these should probably be
-# looked at and manually translated into more idiomatic CMake.
-#
-##===----------------------------------------------------------------------===##
-
-# wrapper around add_subdirectory that can take multiple items.
-macro(llvm_add_subdirectories)
- foreach(V ${ARGV})
- add_subdirectory(${V})
- endforeach(V)
-endmacro()
More information about the llvm-commits
mailing list