From 974ada25e4c611be91eacdc0a2c177ca3ee1fc3f Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Mon, 22 May 2017 00:05:13 -0700 Subject: [PATCH] CMake: use RUNTIME_OUTPUT_DIRECTORY rather than setting OUTPUT_NAME each time --- Source/UnitTests/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index 93e9deb4a8..18bae340a7 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -2,6 +2,8 @@ enable_testing() add_custom_target(unittests) add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND}) +string(APPEND CMAKE_RUNTIME_OUTPUT_DIRECTORY "/Tests") + # Since this is a Core dependency, it can't be linked as a normal library. # Otherwise CMake inserts the library after core, but before other core # dependencies like videocommon which also use Host_ functions, which makes the @@ -13,10 +15,7 @@ macro(add_dolphin_test target) ${ARGN} $ ) - set_target_properties(${target} PROPERTIES - OUTPUT_NAME Tests/${target} - FOLDER Tests - ) + set_target_properties(${target} PROPERTIES FOLDER Tests) target_link_libraries(${target} core gtest_main) add_dependencies(unittests ${target}) add_test(NAME ${target} COMMAND ${target})