From be2f4466e3c8215338d9f18c3ec8637d733901d9 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sat, 20 May 2017 16:21:59 -0700 Subject: [PATCH] CMake: move unittests target to UnitTests --- CMakeLists.txt | 8 +++----- Source/UnitTests/CMakeLists.txt | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58aaaa9c43..67424f11b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -806,13 +806,11 @@ include_directories("${PROJECT_BINARY_DIR}/Source/Core") message(STATUS "Using static gtest from Externals") add_subdirectory(Externals/gtest EXCLUDE_FROM_ALL) -enable_testing() -add_custom_target(unittests) -add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND}) - +######################################## +# Process Dolphin source now that all setup is complete +# add_subdirectory(Source) - ######################################## # Install shared data files # diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index b5f9ad6f43..ebfcd3f046 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -1,3 +1,7 @@ +enable_testing() +add_custom_target(unittests) +add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND}) + set(LIBS core gtest_main) if(APPLE) list(APPEND LIBS ${FOUNDATION_LIBRARY} ${CORESERV_LIBRARY})