Browse Source

Update OSX dependencies for cmake generators other than ninja/make

Palana 11 years ago
parent
commit
cfc3f2590e
2 changed files with 5 additions and 1 deletions
  1. 2 1
      libobs-opengl/CMakeLists.txt
  2. 3 0
      plugins/mac-avcapture/CMakeLists.txt

+ 2 - 1
libobs-opengl/CMakeLists.txt

@@ -28,7 +28,8 @@ elseif(APPLE)
 
 
 	set(libobs-opengl_PLATFORM_DEPS
 	set(libobs-opengl_PLATFORM_DEPS
 		${COCOA}
 		${COCOA}
-		${IOSURF})
+		${IOSURF}
+		${OPENGL_gl_LIBRARY})
 else()
 else()
 	set(libobs-opengl_PLATFORM_SOURCES
 	set(libobs-opengl_PLATFORM_SOURCES
 		gl-x11.c)
 		gl-x11.c)

+ 3 - 0
plugins/mac-avcapture/CMakeLists.txt

@@ -1,12 +1,14 @@
 project(mac-avcapture)
 project(mac-avcapture)
 
 
 find_library(AVFOUNDATION AVFoundation)
 find_library(AVFOUNDATION AVFoundation)
+find_library(COCOA Cocoa)
 find_library(COREFOUNDATION CoreFoundation)
 find_library(COREFOUNDATION CoreFoundation)
 find_library(COREMEDIA CoreMedia)
 find_library(COREMEDIA CoreMedia)
 find_library(COREVIDEO CoreVideo)
 find_library(COREVIDEO CoreVideo)
 
 
 
 
 include_directories(${AVFOUNDATION}
 include_directories(${AVFOUNDATION}
+                    ${COCOA}
                     ${COREFOUNDATION}
                     ${COREFOUNDATION}
                     ${COREMEDIA}
                     ${COREMEDIA}
                     ${COREVIDEO})
                     ${COREVIDEO})
@@ -28,6 +30,7 @@ add_library(mac-avcapture MODULE
 target_link_libraries(mac-avcapture
 target_link_libraries(mac-avcapture
 	libobs
 	libobs
 	${AVFOUNDATION}
 	${AVFOUNDATION}
+	${COCOA}
 	${COREFOUNDATION}
 	${COREFOUNDATION}
 	${COREMEDIA}
 	${COREMEDIA}
 	${COREVIDEO})
 	${COREVIDEO})