Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing cmake dependences #69

Merged
merged 3 commits into from
Dec 8, 2023
Merged

Add missing cmake dependences #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99eaa6a
Add missing Imath dependency
markreidvfx Oct 13, 2023
4ffeb56
Added missing glew dependency
markreidvfx Oct 13, 2023
34247e5
Merge branch 'main' into AL_missing_deps_v1
tedwaine Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/plugin/colour_pipeline/ocio/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
find_package(OpenColorIO CONFIG)
find_package(OpenEXR)
find_package(Imath)
find_package(GLEW REQUIRED)

# Temporary hack - OCIO package is not found/defined by 'modern' .cmake
# package and as such cmake doesn't distinguish the OCIO headers as system
Expand All @@ -11,6 +12,7 @@ include_directories(SYSTEM ${OCIO_INCLUDE_DIRS})
SET(LINK_DEPS
xstudio::colour_pipeline
xstudio::module
GLEW::GLEW
OpenColorIO::OpenColorIO
OpenEXR::OpenEXR
Imath::Imath
Expand Down
3 changes: 3 additions & 0 deletions src/plugin/media_reader/blank/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
find_package(GLEW REQUIRED)

SET(LINK_DEPS
xstudio::media_reader
GLEW::GLEW
)

create_plugin_with_alias(media_reader_blank xstudio::media_reader::blank 0.1.0 "${LINK_DEPS}")
3 changes: 2 additions & 1 deletion src/plugin/media_reader/ffmpeg/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(media_reader_ffmpeg VERSION 0.1.0 LANGUAGES CXX)

find_package(FFMPEG REQUIRED COMPONENTS avcodec avformat swscale avutil)

find_package(GLEW REQUIRED)

set(SOURCES
ffmpeg_stream.cpp
Expand All @@ -22,6 +22,7 @@ target_compile_options(${PROJECT_NAME} PRIVATE -Wfatal-errors)
target_link_libraries(${PROJECT_NAME}
PUBLIC
xstudio::media_reader
GLEW::GLEW
FFMPEG::avcodec
FFMPEG::avformat
FFMPEG::swscale
Expand Down
2 changes: 2 additions & 0 deletions src/plugin/media_reader/openexr/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
find_package(OpenEXR)
find_package(Imath)
find_package(GLEW)

SET(LINK_DEPS
xstudio::media_reader
GLEW::GLEW
OpenEXR::OpenEXR
Imath::Imath
)
Expand Down
3 changes: 3 additions & 0 deletions src/plugin/media_reader/ppm/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
find_package(GLEW REQUIRED)

SET(LINK_DEPS
xstudio::media_reader
GLEW::GLEW
)

create_plugin_with_alias(media_reader_ppm xstudio::media_reader::ppm 0.1.0 "${LINK_DEPS}")
14 changes: 9 additions & 5 deletions src/utility/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
find_package(spdlog REQUIRED)
find_package(fmt REQUIRED)
find_package(Imath REQUIRED)
find_package(nlohmann_json REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_search_module(UUID REQUIRED uuid)

SET(LINK_DEPS
caf::core
fmt::fmt
Imath::Imath
nlohmann_json::nlohmann_json
reproc++
spdlog::spdlog
Expand All @@ -11,17 +19,13 @@ SET(LINK_DEPS
SET(STATIC_LINK_DEPS
caf::core
fmt::fmt
Imath::Imath
nlohmann_json::nlohmann_json
reproc++
spdlog::spdlog
stdc++fs
uuid
)

find_package(spdlog REQUIRED)
find_package(fmt REQUIRED)
find_package(nlohmann_json REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_search_module(UUID REQUIRED uuid)

create_component_static(utility 0.1.0 "${LINK_DEPS}" "${STATIC_LINK_DEPS}")