Commit 124e036a authored by Kyle Lutz's avatar Kyle Lutz Committed by Marcus D. Hanwell
Browse files

Fix VTK/Chemistry compilation error with OpenQube/Qt

This fixes a compilation error in which the Qt headers
required by the OpenQube headers could not be found
because the Qt include directories were not setup when
compiling VTK/Chemistry.

Change-Id: I60a38ca2d95b62571955c6498421eeeceb6aa3b8
parent 94493332
...@@ -40,11 +40,13 @@ SET(KIT_JAVA_DEPS) ...@@ -40,11 +40,13 @@ SET(KIT_JAVA_DEPS)
FIND_PACKAGE(OpenQube QUIET) FIND_PACKAGE(OpenQube QUIET)
IF(OpenQube_FOUND) IF(OpenQube_FOUND)
FIND_PACKAGE(Eigen2 QUIET) FIND_PACKAGE(Eigen2 QUIET)
FIND_PACKAGE(Qt4 COMPONENTS QtCore REQUIRED QUIET)
ENDIF(OpenQube_FOUND) ENDIF(OpenQube_FOUND)
VTK_DEPENDENT_OPTION(VTK_USE_OPENQUBE VTK_DEPENDENT_OPTION(VTK_USE_OPENQUBE
"Compile OpenQube support into vtkChemistry." "Compile OpenQube support into vtkChemistry."
ON "OpenQube_FOUND;EIGEN2_FOUND" OFF) ON "OpenQube_FOUND;EIGEN2_FOUND" OFF)
IF(VTK_USE_OPENQUBE) IF(VTK_USE_OPENQUBE)
INCLUDE(${QT_USE_FILE})
INCLUDE_DIRECTORIES(${OpenQube_INCLUDE_DIRS} ${EIGEN2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OpenQube_INCLUDE_DIRS} ${EIGEN2_INCLUDE_DIR})
SET(KIT_LIBS ${KIT_LIBS} OpenQube) SET(KIT_LIBS ${KIT_LIBS} OpenQube)
SET(Kit_SRCS SET(Kit_SRCS
......
...@@ -26,6 +26,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_CHEMISTRY) ...@@ -26,6 +26,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_CHEMISTRY)
TestCMLMoleculeReader.cxx TestCMLMoleculeReader.cxx
) )
IF(VTK_USE_OPENQUBE) IF(VTK_USE_OPENQUBE)
INCLUDE(${QT_USE_FILE})
# Add Eigen to the include path for the OpenQube headers # Add Eigen to the include path for the OpenQube headers
INCLUDE_DIRECTORIES(${EIGEN2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${EIGEN2_INCLUDE_DIR})
SET(MyTests SET(MyTests
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment