Skip to content

Fix GLEW deprecation errors #20294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

Fix GLEW deprecation errors #20294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions builtins/glew/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ install(TARGETS GLEW
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

ROOT_INSTALL_HEADERS()
2 changes: 1 addition & 1 deletion cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ function (ROOT_CXXMODULES_APPEND_TO_MODULEMAP library library_headers)
TIsAProxy.h TVirtualIsAProxy.h
DllImport.h ESTLType.h Varargs.h
ThreadLocalStorage.h
TBranchProxyTemplate.h TGLWSIncludes.h
TBranchProxyTemplate.h
snprintf.h strlcpy.h)

# Deprecated header files.
Expand Down
5 changes: 2 additions & 3 deletions graf3d/gl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
src/TGLViewerEditor.cxx
src/TGLVoxelPainter.cxx
src/TGLWidget.cxx
src/TGLWSIncludes.h
src/TH2GL.cxx
src/TH3GL.cxx
src/TKDEAdapter.cxx
Expand Down Expand Up @@ -224,6 +225,7 @@ target_include_directories(RGL PRIVATE
${OPENGL_INCLUDE_DIR}
${FTGL_INCLUDE_DIR}
${FREETYPE_INCLUDE_DIRS}
${GLEW_INCLUDE_DIRS}
)

if(builtin_gl2ps)
Expand All @@ -232,9 +234,6 @@ else()
target_include_directories(RGL PRIVATE ${GL2PS_INCLUDE_DIRS})
endif()

# Remove when not needed anymore in the ROOT 6.40 development cycle
target_compile_definitions(RGL PRIVATE _ROOT_GL_BUILDS_ITSELF)

if(MSVC AND builtin_glew)
target_compile_definitions (RGL PRIVATE "GLEW_STATIC")
endif()
Expand Down
48 changes: 0 additions & 48 deletions graf3d/gl/inc/TGLWSIncludes.h
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions graf3d/gl/src/TGLWSIncludes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// @(#)root/gl:$Id$
// Authors: Timur and Matevz, May 2008

/*************************************************************************
* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/

// Window-system specific GL includes.
// Inclusion should only be necessary in in low-level system files.

#ifndef ROOT_TGLWSIncludes

#include "RConfigure.h"
#include "TGLIncludes.h"

#if defined(WIN32)
#include <GL/wglew.h>
#else
#if defined(__APPLE__) && !defined(R__HAS_COCOA)
#define GLEW_APPLE_GLX
#endif
#if !defined(R__HAS_COCOA)
#include <GL/glxew.h>
#endif
#endif

#endif
Loading