COMP: Changes so that if coprocessing is enabled in paraview that the...

COMP: Changes so that if coprocessing is enabled in paraview that the coprocessing libraries and include directories will be loaded in too.

CMakeLists.txt

@@ -330,6 +330,16 @@ SET(PARAVIEW_LIBRARY_DEPENDS_FILE
   "${ParaView_BINARY_DIR}/ParaViewLibraryDepends.cmake")
 EXPORT_LIBRARY_DEPENDENCIES(${PARAVIEW_LIBRARY_DEPENDS_FILE})
 
+#########################################################################
+# Configure the CoProcessing library
+IF (PARAVIEW_ENABLE_PYTHON)
+  OPTION(PARAVIEW_ENABLE_COPROCESSING "Enable/Disable the CoProcessing library." OFF)
+  MARK_AS_ADVANCED(PARAVIEW_ENABLE_COPROCESSING)
+  IF (PARAVIEW_ENABLE_COPROCESSING)
+    ADD_SUBDIRECTORY (CoProcessing)
+  ENDIF (PARAVIEW_ENABLE_COPROCESSING)
+ENDIF (PARAVIEW_ENABLE_PYTHON) 
+
 # Perform build tree configuration. Install configuration is
 # handled below.
 CONFIGURE_FILE(
@@ -464,13 +474,4 @@ IF (NOT PV_INSTALL_NO_DEVELOPMENT)
 
 ENDIF (NOT PV_INSTALL_NO_DEVELOPMENT)
 
-#########################################################################
-# Configure the CoProcessing library
-IF (PARAVIEW_ENABLE_PYTHON)
-  OPTION(PARAVIEW_ENABLE_COPROCESSING "Enable/Disable the CoProcessing library." OFF)
-  MARK_AS_ADVANCED(PARAVIEW_ENABLE_COPROCESSING)
-  IF (PARAVIEW_ENABLE_COPROCESSING)
-    ADD_SUBDIRECTORY (CoProcessing)
-  ENDIF (PARAVIEW_ENABLE_COPROCESSING)
-ENDIF (PARAVIEW_ENABLE_PYTHON) 
 

CoProcessing/CMakeLists.txt

@@ -49,6 +49,7 @@ SET(CoProcessing_INCLUDE_DIRS
   ${CoProcessing_SOURCE_DIR}/Adaptors/PythonAdapter
   ${CoProcessing_SOURCE_DIR}/Adaptors/FortranAdaptors
   ${CoProcessing_SOURCE_DIR}/CoProcessor
+  ${CoProcessing_BINARY_DIR}/CoProcessor
   )
 
 # Save library dependencies.

ParaViewConfig.cmake.in

@@ -57,3 +57,9 @@ SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE@")
 
 # The locations/prefixes where this version of ParaView would be installed.
 SET (PARAVIEW_INSTALL_LIB_DIR "@PV_INSTALL_LIB_DIR@")
+
+SET(PARAVIEW_ENABLE_COPROCESSING "@PARAVIEW_ENABLE_COPROCESSING@")
+IF(PARAVIEW_ENABLE_COPROCESSING)
+  SET(CoProcessing_DIR "@CoProcessing_BINARY_DIR@")
+ENDIF(PARAVIEW_ENABLE_COPROCESSING)
+

ParaViewUse.cmake

@@ -29,4 +29,12 @@ IF(ParaView_FOUND)
       INCLUDE_DIRECTORIES(${PARAVIEW_GUI_INCLUDE_DIRS})
     ENDIF(QT4_FOUND)
   ENDIF(PARAVIEW_BUILD_QT_GUI)
+
+  IF(PARAVIEW_ENABLE_COPROCESSING)
+    FIND_PACKAGE(CoProcessing)
+    IF(CoProcessing_FOUND)
+      INCLUDE(${CoProcessing_USE_FILE})
+    ENDIF(CoProcessing_FOUND)
+  ENDIF(PARAVIEW_ENABLE_COPROCESSING)
+
 ENDIF(ParaView_FOUND)