From 6c0f064e178aab2582b5ffe7f953ef8b4b498458 Mon Sep 17 00:00:00 2001
From: glew Upstream <kwrobot@kitware.com>
Date: Fri, 30 Nov 2018 14:24:40 -0500
Subject: [PATCH] glew 2018-11-30 (87a5df89)
Code extracted from:
https://gitlab.kitware.com/third-party/glew.git
at commit 87a5df890b33241d69c15ac139901dd82a168165 (for/vtk-20181130-ge544f8c).
---
CMakeLists.txt | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2ee373b303..2d8da2034c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,52 +7,48 @@ set(headers
include/GL/vtk_glew_mangle.h
include/GL/wglew.h)
-vtk_add_library(vtkglew ${sources} ${headers})
-if (NOT VTK_INSTALL_NO_DEVELOPMENT)
- install(FILES
- ${headers}
- DESTINATION "${VTK_INSTALL_INCLUDE_DIR}/vtkglew/include/GL"
- COMPONENT Development)
-endif()
-include(vtkOpenGL)
-vtk_opengl_link(vtkglew)
-target_compile_definitions(vtkglew
+vtk_module_add_module(VTK::glew
+ SOURCES ${sources}
+ HEADERS ${headers}
+ HEADERS_SUBDIR "vtkglew/include/GL")
+target_compile_definitions(glew
PRIVATE
GLEW_NO_GLU)
-if(VTK_OPENGL_HAS_OSMESA AND UNIX)
- target_compile_definitions(vtkglew
+# GLEW with OSMesa only works on Linux systems right now.
+if(VTK_OPENGL_HAS_OSMESA AND UNIX AND NOT APPLE)
+ target_compile_definitions(glew
PRIVATE
GLEW_OSMESA)
- target_link_libraries(vtkglew
+ target_link_libraries(glew
PRIVATE
${CMAKE_DL_LIBS})
endif()
if(VTK_OPENGL_HAS_EGL)
- target_compile_definitions(vtkglew
+ target_compile_definitions(glew
PRIVATE
GLEW_EGL)
endif()
if (BUILD_SHARED_LIBS)
if (WIN32)
- target_compile_definitions(vtkglew
+ target_compile_definitions(glew
PRIVATE
GLEW_BUILD)
if(MINGW)
# https://github.com/nigels-com/glew/issues/157
- target_link_libraries(vtkglew
+ target_link_libraries(glew
PRIVATE
-nostdlib)
endif()
endif ()
else ()
- target_compile_definitions(vtkglew
+ target_compile_definitions(glew
PUBLIC
GLEW_STATIC)
endif ()
-target_include_directories(vtkglew
+target_include_directories(glew
PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/include")
--
GitLab