[test-suite] r286276 - cmake: PREFIX: Include minus sign, same name as directory
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 8 11:45:59 PST 2016
Author: matze
Date: Tue Nov 8 13:45:58 2016
New Revision: 286276
URL: http://llvm.org/viewvc/llvm-project?rev=286276&view=rev
Log:
cmake: PREFIX: Include minus sign, same name as directory
- Include the minus sign in the PREFIX name instead of having it
magically be appended by SingleMultiSource.cmake.
- Make sure prefix spelling corresponds to benchmark directory name.
Modified:
test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt
test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt
test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
test-suite/trunk/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt
test-suite/trunk/cmake/modules/SingleMultiSource.cmake
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=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -42,4 +42,4 @@ if(TARGET_OS STREQUAL "Darwin")
# Necessary for ackermann on iOS
list(APPEND LDFLAGS -Xlinker -stack_size -Xlinker 0x800000)
endif()
-llvm_singlesource(PREFIX "shootout-cxx")
+llvm_singlesource(PREFIX Shootout-C++-)
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout-C%2B%2B/EH/CMakeLists.txt?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -1,3 +1,3 @@
set(REQUIRES_EH_SUPPORT 1)
list(APPEND LDFLAGS -lstdc++)
-llvm_singlesource(PREFIX "shootout-cxx")
+llvm_singlesource(PREFIX "Shootout-C++-")
Modified: test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Shootout/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -20,4 +20,4 @@ set(Source
if(NOT TEST_SUITE_BENCHMARKING_ONLY)
list(APPEND Source hello.c)
endif()
-llvm_singlesource(PREFIX "shootout")
+llvm_singlesource(PREFIX Shootout-)
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=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -1,4 +1,4 @@
add_subdirectory(EH)
list(APPEND LDFLAGS -lstdc++)
-llvm_singlesource(PREFIX "regression-cxx")
+llvm_singlesource(PREFIX "Regression-C++-")
Modified: test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C%2B%2B/EH/CMakeLists.txt?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C++/EH/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -1,3 +1,3 @@
set(REQUIRES_EH_SUPPORT 1)
list(APPEND LDFLAGS -lstdc++)
-llvm_singlesource(PREFIX "regression-cxx")
+llvm_singlesource(PREFIX "Regression-C++-")
Modified: test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/Regression/C/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -1,2 +1,2 @@
list(APPEND LDFLAGS -lm)
-llvm_singlesource(PREFIX "regression-c")
+llvm_singlesource(PREFIX "Regression-C-")
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=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -12,4 +12,4 @@ if(ARCH STREQUAL "AArch64")
add_subdirectory(AArch64)
endif()
-llvm_singlesource(PREFIX "Vector")
+llvm_singlesource(PREFIX "Vector-")
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -1,2 +1,2 @@
list(APPEND CFLAGS -std=c99)
-llvm_singlesource(PREFIX "Vector-NEON")
+llvm_singlesource(PREFIX "Vector-NEON-")
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt (original)
+++ test-suite/trunk/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt Tue Nov 8 13:45:58 2016
@@ -2,4 +2,4 @@ set(FP_TOLERANCE 0.016)
list(APPEND LDFLAGS -lm)
list(APPEND TARGET_FLAGS -msse2)
list(APPEND LCCFLAGS -msse2)
-llvm_singlesource(PREFIX "Vector")
+llvm_singlesource(PREFIX "Vector-")
Modified: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/SingleMultiSource.cmake?rev=286276&r1=286275&r2=286276&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake (original)
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake Tue Nov 8 13:45:58 2016
@@ -134,11 +134,7 @@ endmacro()
macro(llvm_test_executable name)
cmake_parse_arguments(_LTARG "" "PREFIX;TARGET_VAR" "" ${ARGN})
- if(_LTARG_PREFIX)
- set(executable "${_LTARG_PREFIX}-${name}")
- else()
- set(executable ${name})
- endif()
+ set(executable ${_LTARG_PREFIX}${name})
unset("${_LTARG_TARGET_VAR}")
add_executable(${executable} ${_LTARG_UNPARSED_ARGUMENTS})
if(_LTARG_TARGET_VAR)
More information about the llvm-commits
mailing list