FLTK logo

[master] 95799bd - Fix for cmake + macOS + OPTION_APPLE_X11 regarding GLU-using apps.

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 95799bd - Fix for cmake + macOS + OPTION_APPLE_X11 regarding GLU-using apps. "ManoloFLTK" Aug 31, 2020  
 
commit 95799bd3641ebe43400aa85dd8cf84405f26aac8
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Mon Aug 31 16:17:04 2020 +0200
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Mon Aug 31 16:17:04 2020 +0200

    Fix for cmake + macOS + OPTION_APPLE_X11 regarding GLU-using apps.

 CMake/options.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git CMake/options.cmake CMake/options.cmake
index 0153a19..ac7fa5b 100644
--- CMake/options.cmake
+++ CMake/options.cmake
@@ -195,8 +195,8 @@ if (OPTION_USE_GL)
   if (OPTION_APPLE_X11)
     set (OPENGL_FOUND TRUE)
     set (OPENGL_LIBRARIES -L${PATH_TO_XLIBS} -lGLU -lGL)
-    find_file (TEMP_HAVE_GL_GLU_H GL/glu.h PATHS /opt/X11/include)
-    set (HAVE_GL_GLU_H ${TEMP_HAVE_GL_GLU_H})
+    unset(HAVE_GL_GLU_H CACHE)
+    find_file (HAVE_GL_GLU_H GL/glu.h PATHS ${X11_INCLUDE_DIR})
   elseif (OPTION_APPLE_SDL)
     set (OPENGL_FOUND FALSE)
   else()
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.