From 942cbd3c8d579796e2eb47c47483ae20191fc421 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sat, 20 May 2017 16:00:55 -0700 Subject: [PATCH] CMake: don't prefix test targets with Test_ The current prefixing makes it harder to build test executables directly from the command line, since the target name breaks CMake convention and doesn't match the name passed to `add_dolphin_test`. They all have "Test" somewhere in the name anyways. --- Source/UnitTests/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index a884724444..b06d4a1ce1 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -12,13 +12,13 @@ macro(add_dolphin_test target srcs) # core, but before other core dependencies like videocommon which also use # Host_ functions. set(srcs2 ${srcs} ${CMAKE_SOURCE_DIR}/Source/UnitTests/TestUtils/StubHost.cpp ${ARGN}) - add_executable(Test_${target} EXCLUDE_FROM_ALL ${srcs2}) - set_target_properties(Test_${target} PROPERTIES + add_executable(${target} EXCLUDE_FROM_ALL ${srcs2}) + set_target_properties(${target} PROPERTIES OUTPUT_NAME Tests/${target} FOLDER Tests ) - target_link_libraries(Test_${target} ${LIBS}) - add_dependencies(unittests Test_${target}) + target_link_libraries(${target} ${LIBS}) + add_dependencies(unittests ${target}) add_test(NAME ${target} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests/${target}) endmacro()