Skip to content

Remove GLEW dependency for MacOS #335

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

Merged
tedwaine merged 2 commits into from
Sep 15, 2026
+9 −13
Merged

Remove GLEW dependency for MacOS #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df2b0ed
Remove glew dependencies for MacOS
tedwaine Sep 4, 2026
e83e4f1
Merge branch 'develop' into remove_glew_dependency_macos
tedwaine Sep 15, 2026
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: 0 additions & 2 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,7 +1,6 @@
find_package(OpenColorIO)
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 @@ -12,7 +11,6 @@ include_directories(SYSTEM ${OCIO_INCLUDE_DIRS})
SET(LINK_DEPS
xstudio::colour_pipeline
xstudio::module
GLEW::GLEW
OpenColorIO::OpenColorIO
OpenEXR::OpenEXR
Imath::Imath
Expand Down
4 changes: 0 additions & 4 deletions 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,5 @@
project(media_reader_ffmpeg VERSION ${XSTUDIO_GLOBAL_VERSION} LANGUAGES CXX)

find_package(GLEW REQUIRED)

set(SOURCES
ffmpeg_stream.cpp
ffmpeg_decoder.cpp
Expand All @@ -26,7 +24,6 @@ if (${USE_VCPKG})
target_link_libraries(${PROJECT_NAME}
PUBLIC
xstudio::media_reader
GLEW::GLEW
PRIVATE
${FFMPEG_LIBRARIES}
)
Expand All @@ -40,7 +37,6 @@ else()
target_link_libraries(${PROJECT_NAME}
PUBLIC
xstudio::media_reader
GLEW::GLEW
FFMPEG::avcodec
FFMPEG::avformat
FFMPEG::swscale
Expand Down
11 changes: 6 additions & 5 deletions src/ui/opengl/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
SET(LINK_DEPS
CAF::core
OpenGL::GL
OpenGL::GLU
GLEW::GLEW
xstudio::ui::base
xstudio::ui::canvas
xstudio::ui::viewport
Expand All @@ -17,8 +15,13 @@ if(UNIX)
list(APPEND LINK_DEPS pthread)
endif()

if (NOT APPLE)
find_package(GLEW REQUIRED)
list(APPEND LINK_DEPS GLEW::GLEW)
endif()


find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(OpenEXR)
find_package(Imath)

Expand All @@ -38,6 +41,4 @@ endif()
target_link_libraries(${PROJECT_NAME}
PRIVATE
freetype
PUBLIC
GLEW::GLEW
)
5 changes: 3 additions & 2 deletions src/ui/opengl/src/gl_debug_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// SPDX-License-Identifier: Apache-2.0
#ifdef __linux__
#include <GL/gl.h>
#ifdef __apple__
#include <OpenGL/gl3.h>
#else
#include <GL/glew.h>
#include <GL/gl.h>
#endif
#include <ImfRgbaFile.h>
#include <vector>
Expand Down
Loading