diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-08-08 14:49:34 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-08-08 14:49:34 +0200 |
| commit | e65681c9ac51dda850162a89397b3eec6ee8123a (patch) | |
| tree | 81beb9b681209bc77c9fd77284915874924c283c /CMake/options.cmake | |
| parent | 713f0b0f64992de8eace6f97d95f4d582f31d9ad (diff) | |
CMake: fix usage of OPENGL_GLU_INCLUDE_DIR (#1001)
This commit consists of two parts:
1. CMake/resources.cmake: remove the old variable OPENGL_GLU_INCLUDE_DIR
from the CMake cache if possible, otherwise enforce a clean build.
2. src/CMakeLists.txt, CMake/options.cmake: use the new variable name
FLTK_OPENGL_GLU_INCLUDE_DIR.
For details please see GitHub Issue #1001.
Diffstat (limited to 'CMake/options.cmake')
| -rw-r--r-- | CMake/options.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index 2a648baba..c6b6ff60d 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -611,7 +611,7 @@ endif(FLTK_OPTION_SVG) ####################################################################### -# FIXME: GL libs have already been searched in resources.cmake +# FIXME: GLU libs have already been searched in resources.cmake set(HAVE_GL LIB_GL OR LIB_MesaGL) set(FLTK_USE_GL FALSE) @@ -681,8 +681,8 @@ set(FLTK_GL_FOUND FALSE) if(OPENGL_FOUND) set(FLTK_GL_FOUND TRUE) - find_path(OPENGL_GLU_INCLUDE_DIR NAMES GL/glu.h OpenGL/glu.h HINTS ${OPENGL_INCLUDE_DIR} ${X11_INCLUDE_DIR}) - set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL ${OPENGL_GLU_INCLUDE_DIR}) + find_path(FLTK_OPENGL_GLU_INCLUDE_DIR NAMES GL/glu.h OpenGL/glu.h HINTS ${OPENGL_INCLUDE_DIR} ${X11_INCLUDE_DIR}) + set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL ${FLTK_OPENGL_GLU_INCLUDE_DIR}) if(WIN32) list(APPEND GLLIBS -lglu32 -lopengl32) |