Merge topic 'vtkm-vtk-install-cleanup'

2b72110d cmake: support suppressing CPack usage
dd1f0962 cmake: allow overriding of the build-tree CMake location
74bd01b4 cmake: install documentation to a "share" location
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1061

CMake/VTKmConfig.cmake.in

@@ -46,7 +46,7 @@ set(VTKm_VERSION_FULL "@VTKm_VERSION_FULL@")
 set(VTKm_VERSION "@VTKm_VERSION@")
 
 # This is true when the package is still in the build directory (not installed)
-if(CMAKE_CURRENT_LIST_DIR STREQUAL "@VTKm_BINARY_DIR@/@VTKm_INSTALL_CONFIG_DIR@")
+if(CMAKE_CURRENT_LIST_DIR STREQUAL "@VTKm_BUILD_CMAKE_BASE_DIR@/@VTKm_INSTALL_CONFIG_DIR@")
   set(VTKm_PACKAGE_IN_BUILD TRUE)
 endif()
 

CMakeLists.txt

@@ -53,8 +53,11 @@ endif()
 if (NOT DEFINED VTKm_INSTALL_BIN_DIR)
   set(VTKm_INSTALL_BIN_DIR "bin")
 endif()
+if (NOT DEFINED VTKm_INSTALL_SHARE_DIR)
+  set(VTKm_INSTALL_SHARE_DIR "share/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}")
+endif()
 if (NOT DEFINED VTKm_INSTALL_CMAKE_MODULE_DIR)
-  set(VTKm_INSTALL_CMAKE_MODULE_DIR "share/vtkm-${VTKm_VERSION_MAJOR}.${VTKm_VERSION_MINOR}/cmake")
+  set(VTKm_INSTALL_CMAKE_MODULE_DIR "${VTKm_INSTALL_SHARE_DIR}/cmake")
 endif()
 
 set(VTKm_BINARY_INCLUDE_DIR "${VTKm_BINARY_DIR}/include")
@@ -274,9 +277,13 @@ set(VTKm_LOAD_COMPONENTS_COMMANDS "${VTKm_LOAD_COMPONENTS_COMMANDS}
   endif()
 endforeach()" )
 
+if (NOT DEFINED VTKm_BUILD_CMAKE_BASE_DIR)
+  set(VTKm_BUILD_CMAKE_BASE_DIR "${VTKm_BINARY_DIR}")
+endif ()
+
 configure_package_config_file(
   ${VTKm_SOURCE_DIR}/CMake/VTKmConfig.cmake.in
-  ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake
+  ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake
   INSTALL_DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
   PATH_VARS
     VTKm_INSTALL_INCLUDE_DIR
@@ -287,23 +294,23 @@ configure_package_config_file(
   )
 
 write_basic_package_version_file(
-  ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake
+  ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake
   VERSION ${VTKm_VERSION}
   COMPATIBILITY ExactVersion )
 install(
   FILES
-    ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake
-    ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake
+    ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfig.cmake
+    ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmConfigVersion.cmake
   DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
   )
 
 # Install the readme and license files.
 install(FILES ${VTKm_SOURCE_DIR}/README.md
-  DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
+  DESTINATION ${VTKm_INSTALL_SHARE_DIR}
   RENAME VTKmREADME.md
   )
 install(FILES ${VTKm_SOURCE_DIR}/LICENSE.txt
-  DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
+  DESTINATION ${VTKm_INSTALL_SHARE_DIR}
   RENAME VTKmLICENSE.txt
   )
 
@@ -332,24 +339,27 @@ install(
 
 # Create and install exports for external projects
 export(EXPORT ${VTKm_EXPORT_NAME}
-  FILE ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmTargets.cmake
+  FILE ${VTKm_BUILD_CMAKE_BASE_DIR}/${VTKm_INSTALL_CONFIG_DIR}/VTKmTargets.cmake
   )
 install(EXPORT ${VTKm_EXPORT_NAME}
   DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
   FILE VTKmTargets.cmake
   )
 
-# Enable CPack packaging
-set(CPACK_PACKAGE_DESCRIPTION_FILE ${VTKm_SOURCE_DIR}/README.md)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The VTKm Toolkit")
-set(CPACK_PACKAGE_NAME "VTKm")
-set(CPACK_PACKAGE_VERSION_MAJOR ${VTKm_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${VTKm_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${VTKm_VERSION_PATCH})
-set(CPACK_PACKAGE_FILE_NAME "VTKm-${VTKm_VERSION}")
-set(CPACK_RESOURCE_FILE_LICENSE ${VTKm_SOURCE_DIR}/LICENSE.txt)
-set(CPACK_RESOURCE_FILE_README ${VTKm_SOURCE_DIR}/README.md)
-include(CPack)
+vtkm_option(VTKm_ENABLE_CPACK "Enable CPack packaging of VTKm" ON)
+if (VTKm_ENABLE_CPACK)
+  # Enable CPack packaging
+  set(CPACK_PACKAGE_DESCRIPTION_FILE ${VTKm_SOURCE_DIR}/README.md)
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The VTKm Toolkit")
+  set(CPACK_PACKAGE_NAME "VTKm")
+  set(CPACK_PACKAGE_VERSION_MAJOR ${VTKm_VERSION_MAJOR})
+  set(CPACK_PACKAGE_VERSION_MINOR ${VTKm_VERSION_MINOR})
+  set(CPACK_PACKAGE_VERSION_PATCH ${VTKm_VERSION_PATCH})
+  set(CPACK_PACKAGE_FILE_NAME "VTKm-${VTKm_VERSION}")
+  set(CPACK_RESOURCE_FILE_LICENSE ${VTKm_SOURCE_DIR}/LICENSE.txt)
+  set(CPACK_RESOURCE_FILE_README ${VTKm_SOURCE_DIR}/README.md)
+  include(CPack)
+endif ()
 
 #-----------------------------------------------------------------------------
 # Build examples