Skip to content
Snippets Groups Projects
Commit c1651395 authored by Guilherme Amadio's avatar Guilherme Amadio
Browse files

graf3d: use imported target for OpenGL

parent 5176a34a
No related branches found
No related tags found
No related merge requests found
...@@ -248,7 +248,8 @@ if(MSVC) ...@@ -248,7 +248,8 @@ if(MSVC)
G__Eve1.cxx G__Eve1.cxx
G__Eve2.cxx G__Eve2.cxx
LIBRARIES LIBRARIES
${OPENGL_LIBRARIES} OpenGL::GL
OpenGL::GLU
${FTGL_LIBRARIES} ${FTGL_LIBRARIES}
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
DEPENDENCIES DEPENDENCIES
...@@ -273,7 +274,8 @@ else() ...@@ -273,7 +274,8 @@ else()
SOURCES SOURCES
${EVE_SOURCES} ${EVE_SOURCES}
LIBRARIES LIBRARIES
${OPENGL_LIBRARIES} OpenGL::GL
OpenGL::GLU
${FTGL_LIBRARIES} ${FTGL_LIBRARIES}
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
DEPENDENCIES DEPENDENCIES
...@@ -285,5 +287,3 @@ else() ...@@ -285,5 +287,3 @@ else()
Physics Physics
) )
endif() endif()
target_include_directories(Eve PUBLIC ${OPENGL_INCLUDE_DIR})
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# CMakeLists.txt file for building ROOT graf3d/ftgl package # CMakeLists.txt file for building ROOT graf3d/ftgl package
############################################################################ ############################################################################
include_directories(${OPENGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}) include_directories(${FREETYPE_INCLUDE_DIRS})
if(MACOSX_GLU_DEPRECATED) if(MACOSX_GLU_DEPRECATED)
add_definitions(-Wno-deprecated-declarations) add_definitions(-Wno-deprecated-declarations)
...@@ -32,7 +32,8 @@ ROOT_LINKER_LIBRARY(FTGL ...@@ -32,7 +32,8 @@ ROOT_LINKER_LIBRARY(FTGL
src/FTTextureGlyph.cxx src/FTTextureGlyph.cxx
src/FTVectoriser.cxx src/FTVectoriser.cxx
LIBRARIES LIBRARIES
${OPENGL_LIBRARIES} OpenGL::GL
OpenGL::GLU
${FREETYPE_LIBRARIES} ${FREETYPE_LIBRARIES}
ZLIB::ZLIB ZLIB::ZLIB
BUILTINS BUILTINS
......
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
ROOT_LINKER_LIBRARY(GLEW ROOT_LINKER_LIBRARY(GLEW
src/glew.c src/glew.c
LIBRARIES LIBRARIES
${OPENGL_LIBRARIES} OpenGL::GL
OpenGL::GLU
) )
target_include_directories(GLEW PUBLIC ${OPENGL_INCLUDE_DIR} PRIVATE inc) target_include_directories(GLEW PRIVATE inc)
# Do not install headers for all platforms and configurations. # Do not install headers for all platforms and configurations.
if(UNIX) if(UNIX)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment