Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
967988c5
Commit
967988c5
authored
9 years ago
by
Roman Tolchenov
Browse files
Options
Downloads
Patches
Plain Diff
Re #11756. Added OpenGL libraries to MantidPlot.
parent
38caeb44
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Code/Mantid/CMakeLists.txt
+9
-0
9 additions, 0 deletions
Code/Mantid/CMakeLists.txt
Code/Mantid/Framework/Geometry/CMakeLists.txt
+0
-7
0 additions, 7 deletions
Code/Mantid/Framework/Geometry/CMakeLists.txt
Code/Mantid/MantidPlot/CMakeLists.txt
+1
-0
1 addition, 0 deletions
Code/Mantid/MantidPlot/CMakeLists.txt
with
10 additions
and
7 deletions
Code/Mantid/CMakeLists.txt
+
9
−
0
View file @
967988c5
...
@@ -37,6 +37,15 @@ set ( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" )
...
@@ -37,6 +37,15 @@ set ( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" )
###########################################################################
###########################################################################
find_package
(
Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml QtSvg Qt3Support REQUIRED
)
find_package
(
Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml QtSvg Qt3Support REQUIRED
)
###########################################################################
# Find OpenGL
###########################################################################
find_package
(
OpenGL REQUIRED
)
# FindOpenGL does not (as of CMake 2.6.4) take notice of the REQUIRED
if
(
NOT OPENGL_FOUND
)
message
(
FATAL_ERROR
"OpenGL was not found."
)
endif
()
###########################################################################
###########################################################################
# Set ParaView information since later items depend on it
# Set ParaView information since later items depend on it
###########################################################################
###########################################################################
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/Geometry/CMakeLists.txt
+
0
−
7
View file @
967988c5
...
@@ -342,13 +342,6 @@ if(UNITY_BUILD)
...
@@ -342,13 +342,6 @@ if(UNITY_BUILD)
enable_unity_build
(
Geometry SRC_FILES SRC_UNITY_IGNORE_FILES 10
)
enable_unity_build
(
Geometry SRC_FILES SRC_UNITY_IGNORE_FILES 10
)
endif
(
UNITY_BUILD
)
endif
(
UNITY_BUILD
)
# Find 'local' dependencies
find_package
(
OpenGL REQUIRED
)
# FindOpenGL does not (as of CMake 2.6.4) take notice of the REQUIRED
if
(
NOT OPENGL_FOUND
)
message
(
FATAL_ERROR
"OpenGL was not found."
)
endif
()
# ===================== Open Cascade ===================
# ===================== Open Cascade ===================
if
(
ENABLE_OPENCASCADE
)
if
(
ENABLE_OPENCASCADE
)
find_package
(
OpenCascade REQUIRED
)
find_package
(
OpenCascade REQUIRED
)
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/MantidPlot/CMakeLists.txt
+
1
−
0
View file @
967988c5
...
@@ -898,6 +898,7 @@ target_link_libraries ( MantidPlot LINK_PRIVATE
...
@@ -898,6 +898,7 @@ target_link_libraries ( MantidPlot LINK_PRIVATE
${
QSCINTILLA_LIBRARIES
}
${
QSCINTILLA_LIBRARIES
}
${
PYTHON_LIBRARIES
}
${
PYTHON_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
OPENGL_LIBRARIES
}
)
)
if
(
WITH_ASAN
)
if
(
WITH_ASAN
)
...
...
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