ENH: Added development files to make install.

CMakeLists.txt

@@ -2,6 +2,11 @@ PROJECT(Xdmf)
 
 SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
 
+# Send VTK executables to the ParaView LIBRARY directory (not a mistake).
+# Send VTK include files to the ParaView include directory
+# Send VTK libraries to the ParaView library directory.
+SET(VTK_INSTALL_PACKAGE_DIR_CM24 ${PV_INSTALL_LIB_DIR})
+
 IF (PARAVIEW_USE_MPI)
   SET(XDMF_BUILD_MPI 1)
   INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})

Ice/CMakeLists.txt

@@ -90,5 +90,9 @@ CONFIGURE_FILE(
   )
 
 IF(NOT XDMF_INSTALL_NO_DEVELOPMENT)
-  INSTALL_FILES(${XDMF_INSTALL_INCLUDE_DIR} .h IceConfig ice)
+  FILE(GLOB devFiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+  INSTALL(
+      FILES ${devFiles}
+      DESTINATION ${XDMF_INSTALL_INCLUDE_DIR})
+#   INSTALL_FILES(${XDMF_INSTALL_INCLUDE_DIR} .h IceConfig ice)
 ENDIF(NOT XDMF_INSTALL_NO_DEVELOPMENT)

libsrc/CMakeLists.txt

@@ -361,26 +361,20 @@ IF(XDMF_BUILD_TESTING)
 ENDIF(XDMF_BUILD_TESTING)
 
 IF(NOT XDMF_INSTALL_NO_DEVELOPMENT)
-  INSTALL_FILES(${XDMF_INSTALL_INCLUDE_DIR} .h
-    XdmfConfig
-    Xdmf
-    XdmfArrayCopyMacro
-    XdmfExport
-    XdmfExpr
-    ${XdmfFormatSource}
-    ${XdmfModelSource})
+  FILE(GLOB devFiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+  INSTALL(
+      FILES ${devFiles}
+      DESTINATION ${XDMF_INSTALL_INCLUDE_DIR})
 ENDIF(NOT XDMF_INSTALL_NO_DEVELOPMENT)
 
 IF(NOT XDMF_INSTALL_NO_LIBRARIES)
-  IF(PV_INSTALL_HAS_CMAKE_24)
-    INSTALL(TARGETS Xdmf
-      RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime
-      LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR_CM24} COMPONENT Runtime
-      ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-  ELSE(PV_INSTALL_HAS_CMAKE_24)
-    INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} Xdmf)
-  ENDIF(PV_INSTALL_HAS_CMAKE_24)
+  INSTALL(TARGETS Xdmf
+    RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime
+    LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Runtime
+    ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Development)
   IF(XDMF_WRAP_PYTHON)
-    INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} _Xdmf)
+    INSTALL(
+        TARGETS _Xdmf
+        ${XDMF_INSTALL_LIB_DIR})
   ENDIF(XDMF_WRAP_PYTHON)
 ENDIF(NOT XDMF_INSTALL_NO_LIBRARIES)

vtk/CMakeLists.txt

@@ -102,23 +102,31 @@ ELSE(VTK_FOUND)
 ENDIF (VTK_FOUND)
 
 IF(NOT XDMF_INSTALL_NO_DEVELOPMENT)
-  INSTALL_FILES(${XDMF_INSTALL_INCLUDE_VTK_DIR} .h ${Xdmf_SRCS})
+  FILE(GLOB dotHFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
+  FILE(GLOB binDotHFiles RELATIVE "${Xdmf_BINARY_DIR}/vtk" "*.h")
+  SET(devFiles "${dotHFiles};${binDotHFiles}")
+  INSTALL(
+      FILES ${devFiles}
+      DESTINATION ${XDMF_INSTALL_INCLUDE_VTK_DIR})
+#   INSTALL_FILES(${XDMF_INSTALL_INCLUDE_VTK_DIR} .h ${Xdmf_SRCS})
 ENDIF(NOT XDMF_INSTALL_NO_DEVELOPMENT)
 IF (VTK_FOUND)
   IF(NOT XDMF_INSTALL_NO_LIBRARIES)
-    IF(PV_INSTALL_HAS_CMAKE_24)
       INSTALL(TARGETS vtkXdmf
-        RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime
-        LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR_CM24} COMPONENT Runtime
-        ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-    ELSE(PV_INSTALL_HAS_CMAKE_24)
-      INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} vtkXdmf)
-    ENDIF(PV_INSTALL_HAS_CMAKE_24)
+        RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime
+        LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Runtime
+        ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Development)
     IF(VTK_WRAP_TCL)
-      INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} vtk${PROJECT_NAME}TCL)
+      INSTALL(
+          TARGETS vtk${PROJECT_NAME}TCL
+          DESTINATION ${XDMF_INSTALL_LIB_DIR})
+#       INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} vtk${PROJECT_NAME}TCL)
     ENDIF(VTK_WRAP_TCL)
     IF(VTK_WRAP_PYTHON)
-       INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} vtk${PROJECT_NAME}Python)
+       INSTALL(
+          TARGETS vtk${PROJECT_NAME}Python
+          DESTINATION ${XDMF_INSTALL_LIB_DIR})
+#        INSTALL_TARGETS(${XDMF_INSTALL_LIB_DIR} vtk${PROJECT_NAME}Python)
     ENDIF(VTK_WRAP_PYTHON)
   ENDIF(NOT XDMF_INSTALL_NO_LIBRARIES)
 ENDIF (VTK_FOUND)