From 7e58fecc86ff22e98a2c3917d7cc2d3a0000e27f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 28 Jan 2014 00:06:46 -0700 Subject: [PATCH] Check iosurf dependency in test-input cmake files --- test/test-input/CMakeLists.txt | 10 +++++++--- test/test-input/test-input.c | 9 ++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/test/test-input/CMakeLists.txt b/test/test-input/CMakeLists.txt index 0cd0e5833..e96ceb727 100644 --- a/test/test-input/CMakeLists.txt +++ b/test/test-input/CMakeLists.txt @@ -6,12 +6,16 @@ if(APPLE) set(test-input_PLATFORM_SOURCES test-desktop.m) - set(test-input_PLATFORM_DEPS - ${IOSURF}) - set_source_files_properties(test-desktop.m PROPERTIES LANGUAGE C COMPILE_FLAGS "-fobjc-arc") + + find_library(IOSURF IOSurface) + include_directories(${IOSURF}) + mark_as_advanced(${IOSURF}) + + set(test-input_PLATFORM_DEPS + ${IOSURF}) endif() set(test-input_SOURCES diff --git a/test/test-input/test-input.c b/test/test-input/test-input.c index 496e9e844..3b4e5d337 100644 --- a/test/test-input/test-input.c +++ b/test/test-input/test-input.c @@ -1,7 +1,14 @@ #include #include "test-input-exports.h" -const char *inputs[] = {"desktop", "random", "sinewave"}; +const char *inputs[] = { +#ifdef __APPLE__ + "osx-desktop-test", +#endif + "random", + "sinewave" +}; + const char *filters[] = {"test"}; uint32_t module_version(uint32_t in_version)