From 6a32b758af9cef108b49a58e0feff88dd7e9f487 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Sat, 26 Feb 2022 13:24:07 +0100 Subject: [PATCH] Remove a mistake, GLEW is not required when including the correct headers --- CMakeLists.txt | 3 +-- SimGearConfig.cmake.in | 1 - simgear/CMakeLists.txt | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 845122a6..505ed592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF) option(ENABLE_GDAL "Set to ON to build SimGear with GDAL support" OFF) option(ENABLE_TESTS "Set to OFF to disable building SimGear's test applications" ON) option(ENABLE_SOUND "Set to OFF to disable building SimGear's sound support" ON) -option(USE_SHADERVG "Set to ON to use SHaderVG instead of ShivaVG" OFF) +option(USE_SHADERVG "Set to ON to use SHaderVG instead of ShivaVG" ON) option(USE_AEONWAVE "Set to ON to use AeonWave instead of OpenAL" ON) option(USE_OPENALSOFT "Set to ON to use OpenAL from OpenAL-soft" OFF) @@ -111,7 +111,6 @@ endif() if (USE_SHADERVG) set(OPENVG ShaderVG) - find_package(GLEW REQUIRED) else() set(OPENVG ShivaVG) endif() diff --git a/SimGearConfig.cmake.in b/SimGearConfig.cmake.in index db5dcbb6..1b8b442b 100644 --- a/SimGearConfig.cmake.in +++ b/SimGearConfig.cmake.in @@ -14,7 +14,6 @@ set(SG_SOUND_USES_OPENALSOFT @SG_SOUND_USES_OPENALSOFT@) set(USE_SHADERVG @USE_SHADERVG@) if (USE_SHADERVG) - find_dependency(GLEW REQUIRED) endif() set(ENABLE_ASAN @ENABLE_ASAN@) diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt index 57e04368..a049d90d 100644 --- a/simgear/CMakeLists.txt +++ b/simgear/CMakeLists.txt @@ -173,10 +173,6 @@ if(NOT SIMGEAR_HEADLESS) ${FFMPEG_LIBRARIES} FGTinyGLTF) - if (USE_SHADERVG) - target_link_libraries(SimGearScene PRIVATE GLEW::GLEW) - endif() - # ToDo: define an ALIAS target for the sound backend, to get # rid of this logic here if (ENABLE_SOUND)