From bc63ea7629c8c3c4248a777d1c0325ae800556e0 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 1 May 2024 17:31:17 +0200 Subject: CMake: improve linking OpenGL3 example programs (#959) - Remove find_library(LIB_GLEW ...) from 'resources.cmake' - Use the variable FLTK_GLEW_DIR to "find" a user supplied GLEW library for OpenGL3 example programs (examples/OpenGL3*.cxx). Both static and shared libs (DLLs) are supported, but the static library is preferred to avoid DLL dependencies. - Define preprocessor macro 'GLEW_STATIC' by CMake compile definitions if and only if the static glew library (glew32s) was found and linked. The previous code defined 'GLEW_STATIC' unconditionally in the source code which led to undefined references if a shared lib (DLL) was used. --- CMake/resources.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'CMake') diff --git a/CMake/resources.cmake b/CMake/resources.cmake index 3fd8205f1..eaea18c07 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake @@ -152,14 +152,13 @@ endif((NOT APPLE) OR FLTK_BACKEND_X11) find_library(LIB_freetype freetype) find_library(LIB_GL GL) find_library(LIB_MesaGL MesaGL) -find_library(LIB_GLEW NAMES GLEW glew32) find_library(LIB_jpeg jpeg) find_library(LIB_png png) find_library(LIB_zlib z) find_library(LIB_m m) mark_as_advanced(LIB_dl LIB_fontconfig LIB_freetype) -mark_as_advanced(LIB_GL LIB_MesaGL LIB_GLEW) +mark_as_advanced(LIB_GL LIB_MesaGL) mark_as_advanced(LIB_jpeg LIB_png LIB_zlib) mark_as_advanced(LIB_m) -- cgit v1.2.3