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
fc44f4af
Commit
fc44f4af
authored
4 years ago
by
Oksana Shadura
Committed by
Oksana Shadura
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[ROOT-10640] OpenGL/Glew should be working only with X11 (for Linux)
parent
a020a70b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/modules/RootBuildOptions.cmake
+9
-0
9 additions, 0 deletions
cmake/modules/RootBuildOptions.cmake
cmake/modules/SearchInstalledSoftware.cmake
+1
-0
1 addition, 0 deletions
cmake/modules/SearchInstalledSoftware.cmake
with
10 additions
and
0 deletions
cmake/modules/RootBuildOptions.cmake
+
9
−
0
View file @
fc44f4af
...
...
@@ -335,6 +335,15 @@ if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set
(
dataframe_defvalue OFF
)
endif
()
# OpenGL should be working only with x11 (Linux),
# in case when -Dall=ON -Dx11=OFF, we will just disable opengl.
if
(
NOT WIN32 AND NOT APPLE
)
if
(
opengl AND NOT x11
)
message
(
STATUS
"OpenGL was disabled, since it is required to have enabled x11 on Linux"
)
set
(
opengl OFF CACHE BOOL
"OpenGL requires to have enabled x11"
FORCE
)
endif
()
endif
()
#---Options depending of CMake Generator-------------------------------------------------------
if
(
CMAKE_GENERATOR STREQUAL Ninja
)
set
(
fortran_defvalue OFF
)
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/SearchInstalledSoftware.cmake
+
1
−
0
View file @
fc44f4af
...
...
@@ -514,6 +514,7 @@ if(opengl)
endif
()
#---Check for GLEW -------------------------------------------------------------------
# Opengl is "must" requirement for Glew.
if
(
opengl AND NOT builtin_glew
)
message
(
STATUS
"Looking for GLEW"
)
if
(
fail-on-missing
)
...
...
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