summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-28 07:46:59 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-28 07:46:59 +0200
commitcebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f (patch)
tree132bb5aa5daaaeb5ec549e2f6a11a4e23a5f826c
parentCMake: Create INTERFACE targets for microprofile and nihstro (diff)
downloadyuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.tar
yuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.tar.gz
yuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.tar.bz2
yuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.tar.lz
yuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.tar.xz
yuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.tar.zst
yuzu-cebdae6c92f56b4e56b4aedd5d65c7fff0c7e44f.zip
-rw-r--r--externals/CMakeLists.txt4
-rw-r--r--src/tests/CMakeLists.txt6
2 files changed, 6 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 57fc5d566..db70eecd9 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,3 +1,7 @@
+# Catch
+add_library(catch-single-include INTERFACE)
+target_include_directories(catch-single-include INTERFACE catch/single_include)
+
# Xbyak
if (ARCHITECTURE_x86_64)
add_library(xbyak INTERFACE)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 85f2f2985..00d7c636a 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -10,11 +10,9 @@ set(HEADERS
create_directory_groups(${SRCS} ${HEADERS})
-include_directories(../../externals/catch/single_include/)
-
add_executable(tests ${SRCS} ${HEADERS})
target_link_libraries(tests PRIVATE common core)
target_link_libraries(tests PRIVATE glad) # To support linker work-around
-target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
+target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads)
-add_test(NAME tests COMMAND $<TARGET_FILE:tests>)
+add_test(NAME tests COMMAND tests)