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 /src | |
| 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 'src')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a543b4f93..614d93cac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -849,8 +849,8 @@ if(FLTK_USE_GL) target_link_libraries(fltk_gl PRIVATE ${OPTIONAL_LIBS}) target_include_directories(fltk_gl PRIVATE ${OPTIONAL_INCLUDES}) - if(OPENGL_GLU_INCLUDE_DIR) - target_include_directories(fltk_gl PUBLIC ${OPENGL_GLU_INCLUDE_DIR}) + if(FLTK_OPENGL_GLU_INCLUDE_DIR) + target_include_directories(fltk_gl PUBLIC ${FLTK_OPENGL_GLU_INCLUDE_DIR}) endif() endif(FLTK_USE_GL) @@ -912,8 +912,8 @@ if(FLTK_BUILD_SHARED_LIBS AND NOT MSVC) target_link_libraries(fltk_gl-shared PRIVATE ${OPTIONAL_LIBS}) target_include_directories(fltk_gl-shared PRIVATE ${OPTIONAL_INCLUDES}) - if(OPENGL_GLU_INCLUDE_DIR) - target_include_directories(fltk_gl-shared PUBLIC ${OPENGL_GLU_INCLUDE_DIR}) + if(FLTK_OPENGL_GLU_INCLUDE_DIR) + target_include_directories(fltk_gl-shared PUBLIC ${FLTK_OPENGL_GLU_INCLUDE_DIR}) endif() endif(FLTK_USE_GL) @@ -956,8 +956,8 @@ if(FLTK_BUILD_SHARED_LIBS AND MSVC) if(OPENGL_FOUND) target_link_libraries(fltk-shared PUBLIC ${OPENGL_LIBRARIES}) target_include_directories(fltk-shared PUBLIC ${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS}) - if(OPENGL_GLU_INCLUDE_DIR) - target_include_directories(fltk-shared PUBLIC ${OPENGL_GLU_INCLUDE_DIR}) + if(FLTK_OPENGL_GLU_INCLUDE_DIR) + target_include_directories(fltk-shared PUBLIC ${FLTK_OPENGL_GLU_INCLUDE_DIR}) endif() endif(OPENGL_FOUND) |