Commit 0ab25d36 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build with CMake on Mac OS X.

parent 0aa91d61
...@@ -247,14 +247,18 @@ if(ENABLE_VIDEO) ...@@ -247,14 +247,18 @@ if(ENABLE_VIDEO)
voip/ioshardware.m voip/ioshardware.m
) )
else() else()
set(OBJC_VOIP_SOURCE_FILES
videofilters/msosxdisplay.m
videofilters/qtcapture.m
)
list(APPEND VOIP_SOURCE_FILES list(APPEND VOIP_SOURCE_FILES
utils/opengles_display.c utils/opengles_display.c
utils/opengles_display.h utils/opengles_display.h
utils/shaders.c utils/shaders.c
utils/shaders.h utils/shaders.h
videofilters/msosxdisplay.m ${OBJC_VOIP_SOURCE_FILES}
videofilters/qtcapture.m
) )
set_source_files_properties(${OBJC_VOIP_SOURCE_FILES} PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations")
endif() endif()
endif() endif()
if (ENABLE_QNX) if (ENABLE_QNX)
......
...@@ -41,6 +41,7 @@ if(ENABLE_VIDEO) ...@@ -41,6 +41,7 @@ if(ENABLE_VIDEO)
endif() endif()
if(APPLE) if(APPLE)
list(APPEND SOURCE_FILES mediastreamer2_tester_cocoa.m) list(APPEND SOURCE_FILES mediastreamer2_tester_cocoa.m)
set_source_files_properties(mediastreamer2_tester_cocoa.m PROPERTIES COMPILE_FLAGS "-Wno-error")
endif() endif()
add_executable(mediastreamer2_tester ${SOURCE_FILES}) add_executable(mediastreamer2_tester ${SOURCE_FILES})
......
...@@ -44,6 +44,7 @@ endif() ...@@ -44,6 +44,7 @@ endif()
set(MEDIASTREAM_SOURCE_FILES mediastream.c common.c) set(MEDIASTREAM_SOURCE_FILES mediastream.c common.c)
if(APPLE) if(APPLE)
list(APPEND MEDIASTREAM_SOURCE_FILES mediastream_cocoa.m) list(APPEND MEDIASTREAM_SOURCE_FILES mediastream_cocoa.m)
set_source_files_properties(mediastream_cocoa.m PROPERTIES COMPILE_FLAGS "-Wno-error")
endif() endif()
add_executable(mediastream ${MEDIASTREAM_SOURCE_FILES}) add_executable(mediastream ${MEDIASTREAM_SOURCE_FILES})
target_link_libraries(mediastream mediastreamer_voip mediastreamer_base) target_link_libraries(mediastream mediastreamer_voip mediastreamer_base)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment