Skip to content

Commit

Permalink
🚧 more change link
Browse files Browse the repository at this point in the history
  • Loading branch information
tristetemps666 committed Aug 3, 2023
1 parent f616f9f commit 7fcfd28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 3 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ if(WIN32)
target_link_libraries(webcam_info PRIVATE strmiids)
endif()

if(APPLE)
target_link_libraries(webcam_info PRIVATE "-framework IOKit")
endif()

# ---Add source files---
if(WARNINGS_AS_ERRORS_FOR_WEBCAM_INFO)
target_include_directories(webcam_info PUBLIC include)
Expand All @@ -26,7 +22,9 @@ file(GLOB_RECURSE SRC_FILES_MACOS CONFIGURE_DEPENDS src/*.mm)
target_sources(webcam_info PRIVATE ${SRC_FILES})

if(APPLE)
target_link_libraries(${PROJECT_NAME} PRIVATE "-framework AVFoundation")
target_link_libraries(webcam_info PRIVATE "-framework AVFoundation")
target_link_libraries(webcam_info PRIVATE "-framework CoreMedia")
target_link_libraries(webcam_info PRIVATE "-framework IOKit")

if(NOT XCODE)
target_sources(webcam_info PRIVATE ${SRC_FILES_MACOS})
Expand Down
3 changes: 2 additions & 1 deletion src/webcam_info.mm
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#include <AVFoundation/AVFoundation.h>
#include <CoreMedia/CMFormatDescription.h>
#include <CoreMedia/CMVideoFormatDescription.h>
#include <string>
#include <vector>
#include <webcam_info/webcam_info.hpp>


namespace webcam_info {

// enum class pixel_format { unknown, yuyv, mjpeg };
Expand Down

0 comments on commit 7fcfd28

Please sign in to comment.