Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
c1651395
Commit
c1651395
authored
6 years ago
by
Guilherme Amadio
Browse files
Options
Downloads
Patches
Plain Diff
graf3d: use imported target for OpenGL
parent
5176a34a
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
graf3d/eve/CMakeLists.txt
+4
-4
4 additions, 4 deletions
graf3d/eve/CMakeLists.txt
graf3d/ftgl/CMakeLists.txt
+3
-2
3 additions, 2 deletions
graf3d/ftgl/CMakeLists.txt
graf3d/glew/CMakeLists.txt
+3
-2
3 additions, 2 deletions
graf3d/glew/CMakeLists.txt
with
10 additions
and
8 deletions
graf3d/eve/CMakeLists.txt
+
4
−
4
View file @
c1651395
...
@@ -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
}
)
This diff is collapsed.
Click to expand it.
graf3d/ftgl/CMakeLists.txt
+
3
−
2
View file @
c1651395
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
graf3d/glew/CMakeLists.txt
+
3
−
2
View file @
c1651395
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment