瀏覽代碼

Check iosurf dependency in test-input cmake files

jp9000 11 年之前
父節點
當前提交
7e58fecc86
共有 2 個文件被更改,包括 15 次插入4 次删除
  1. 7 3
      test/test-input/CMakeLists.txt
  2. 8 1
      test/test-input/test-input.c

+ 7 - 3
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

+ 8 - 1
test/test-input/test-input.c

@@ -1,7 +1,14 @@
 #include <obs.h>
 #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)