diff --git a/src/plugin/colour_pipeline/ocio/src/CMakeLists.txt b/src/plugin/colour_pipeline/ocio/src/CMakeLists.txt index 8b226b16b..e6e57beb4 100644 --- a/src/plugin/colour_pipeline/ocio/src/CMakeLists.txt +++ b/src/plugin/colour_pipeline/ocio/src/CMakeLists.txt @@ -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 @@ -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 diff --git a/src/plugin/media_reader/ffmpeg/src/CMakeLists.txt b/src/plugin/media_reader/ffmpeg/src/CMakeLists.txt index 53c4015e4..76a228264 100644 --- a/src/plugin/media_reader/ffmpeg/src/CMakeLists.txt +++ b/src/plugin/media_reader/ffmpeg/src/CMakeLists.txt @@ -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 @@ -26,7 +24,6 @@ if (${USE_VCPKG}) target_link_libraries(${PROJECT_NAME} PUBLIC xstudio::media_reader - GLEW::GLEW PRIVATE ${FFMPEG_LIBRARIES} ) @@ -40,7 +37,6 @@ else() target_link_libraries(${PROJECT_NAME} PUBLIC xstudio::media_reader - GLEW::GLEW FFMPEG::avcodec FFMPEG::avformat FFMPEG::swscale diff --git a/src/ui/opengl/src/CMakeLists.txt b/src/ui/opengl/src/CMakeLists.txt index 0d373d9b5..f75e3efb1 100644 --- a/src/ui/opengl/src/CMakeLists.txt +++ b/src/ui/opengl/src/CMakeLists.txt @@ -1,8 +1,6 @@ SET(LINK_DEPS CAF::core OpenGL::GL - OpenGL::GLU - GLEW::GLEW xstudio::ui::base xstudio::ui::canvas xstudio::ui::viewport @@ -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) @@ -38,6 +41,4 @@ endif() target_link_libraries(${PROJECT_NAME} PRIVATE freetype - PUBLIC - GLEW::GLEW ) diff --git a/src/ui/opengl/src/gl_debug_utils.cpp b/src/ui/opengl/src/gl_debug_utils.cpp index 6bee072b6..a08a6472a 100644 --- a/src/ui/opengl/src/gl_debug_utils.cpp +++ b/src/ui/opengl/src/gl_debug_utils.cpp @@ -1,8 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 -#ifdef __linux__ -#include +#ifdef __apple__ +#include #else #include +#include #endif #include #include