Skip to content
Snippets Groups Projects
Commit 967988c5 authored by Roman Tolchenov's avatar Roman Tolchenov
Browse files

Re #11756. Added OpenGL libraries to MantidPlot.

parent 38caeb44
No related branches found
No related tags found
No related merge requests found
...@@ -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
########################################################################### ###########################################################################
......
...@@ -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 )
......
...@@ -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)
......
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