Skip to content
Snippets Groups Projects
Commit 4772d7ea authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Graeme Stewart
Browse files

Adding support for graphviz, and Qt5 (AtlasLCG-00-00-57)

	* Updated the package to find Graphviz's dot executable using
	  FindDoxygen.cmake, and also set up a dependency on the graphviz RPM.
	* Took the opportunity to also add LCG's Qt5 to CMAKE_PREFIX_PATH.
	  But a bit more will be needed before we could use Qt5 in a
	  relocatable manner from LCG.
	* Tagging as AtlasLCG-00-00-57


Former-commit-id: 687baf2f27c64633ae76f2c1efd8b05fac6480e7
parent 4609635e
No related branches found
No related tags found
No related merge requests found
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# $Id: LCGConfig.cmake 746545 2016-05-12 11:40:48Z krasznaa $
# $Id: LCGConfig.cmake 751138 2016-05-31 13:50:48Z krasznaa $
#
# File implementing the code that gets called when a project imports
# LCG using something like:
......@@ -381,6 +381,8 @@ set( PYTHON_LIBRARY ${PYTHON_LIBRARY}
list( APPEND CMAKE_PREFIX_PATH ${DOXYGEN_ROOT} )
set( GSL_ROOT_DIR ${GSL_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${QT_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${QT5_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${GRAPHVIZ_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${COIN3D_ROOT} )
list( APPEND CMAKE_PREFIX_PATH ${EXPAT_ROOT} )
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
# $Id: FindDoxygen.cmake 719980 2016-01-27 08:38:07Z krasznaa $
# $Id: FindDoxygen.cmake 751138 2016-05-31 13:50:48Z krasznaa $
#
# This file is here to intercept find_package(Doxygen) calls, and extend the
# environment setup file of the project with the correct Doxygen paths.
......@@ -33,5 +33,11 @@ if( DOXYGEN_EXECUTABLE )
get_filename_component( DOXYGEN_BINARY_PATH ${DOXYGEN_EXECUTABLE} PATH )
endif()
# This is just needed to set up a proper dependency on graphviz:
if( DOXYGEN_DOT_FOUND )
set( GRAPHVIZ_FOUND TRUE )
endif()
# Set up the RPM dependency:
lcg_need_rpm( doxygen )
lcg_need_rpm( graphviz )
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