From 82398e5724ed5356238393dea7993ba6f7514818 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 27 Nov 2023 22:00:43 -0500 Subject: [PATCH] Meta: Silence warnings from optional CMake packages These can be quite verbose on the command line if the packages aren't found. As they do not break the build, let's not spam warnings. The OpenGL package is also now skipped on macOS, where there's no point in looking for the package anyways. --- Meta/CMake/accelerated_graphics.cmake | 18 +++++++++--------- Meta/Lagom/CMakeLists.txt | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Meta/CMake/accelerated_graphics.cmake b/Meta/CMake/accelerated_graphics.cmake index 248a3fbde5..07e9270df8 100644 --- a/Meta/CMake/accelerated_graphics.cmake +++ b/Meta/CMake/accelerated_graphics.cmake @@ -4,16 +4,16 @@ if (NOT ENABLE_ACCELERATED_GRAPHICS OR EMSCRIPTEN) return() endif() -find_package(OpenGL COMPONENTS OpenGL EGL) - -if (OPENGL_FOUND) - set(HAS_ACCELERATED_GRAPHICS ON CACHE BOOL "" FORCE) - set(ACCEL_GFX_LIBS OpenGL::OpenGL OpenGL::EGL CACHE STRING "" FORCE) -else() - set(HAS_ACCELERATED_GRAPHICS OFF CACHE BOOL "" FORCE) -endif() - if (APPLE) set(HAS_ACCELERATED_GRAPHICS ON CACHE BOOL "" FORCE) set(ACCEL_GFX_LIBS "-framework OpenGL" CACHE STRING "" FORCE) +else() + find_package(OpenGL QUIET COMPONENTS OpenGL EGL) + + if (OPENGL_FOUND) + set(HAS_ACCELERATED_GRAPHICS ON CACHE BOOL "" FORCE) + set(ACCEL_GFX_LIBS OpenGL::OpenGL OpenGL::EGL CACHE STRING "" FORCE) + else() + set(HAS_ACCELERATED_GRAPHICS OFF CACHE BOOL "" FORCE) + endif() endif() diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index ee13f7236a..33ae2a62a7 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -549,8 +549,8 @@ if (BUILD_LAGOM) add_serenity_subdirectory(Meta/Lagom/Contrib/MacPDF) endif() - find_package(SDL2) - if(SDL2_FOUND) + find_package(SDL2 QUIET) + if (SDL2_FOUND) add_serenity_subdirectory(Meta/Lagom/Contrib/VideoPlayerSDL) endif()