Commit d6da00b6 authored by Chuck Atkins's avatar Chuck Atkins
Browse files

Patch the VTKConfig shipped with ParaView

parent 21309091
......@@ -210,4 +210,6 @@ endif ()
if (paraview_SOURCE_SELECTION STREQUAL "5.3.0")
superbuild_apply_patch(paraview fix-benchmarks
"Fix various issues with the shipped benchmark scripts")
superbuild_apply_patch(paraview fix-vtkconfig-part1
"Fix various issues with the VTKConfig.cmake (Part 1)")
endif ()
--- a/VTK/CMake/vtkModuleTop.cmake
+++ b/VTK/CMake/vtkModuleTop.cmake
@@ -309,11 +309,11 @@ endforeach()
if(NOT VTK_MODULES_ENABLED)
message(WARNING "No modules enabled!")
- file(REMOVE "${VTK_BINARY_DIR}/VTKTargets.cmake")
+ file(REMOVE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
return()
endif()
-file(WRITE "${VTK_BINARY_DIR}/VTKTargets.cmake"
+file(WRITE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake"
"# Generated by CMake, do not edit!")
macro(verify_vtk_module_is_set)
@@ -324,9 +324,9 @@ endmacro()
macro(init_module_vars)
verify_vtk_module_is_set()
- set(${vtk-module}-targets VTKTargets)
- set(${vtk-module}-targets-install "${VTK_INSTALL_PACKAGE_DIR}/VTKTargets.cmake")
- set(${vtk-module}-targets-build "${VTK_BINARY_DIR}/VTKTargets.cmake")
+ set(${vtk-module}-targets ${VTK_INSTALL_EXPORT_NAME})
+ set(${vtk-module}-targets-install "${VTK_INSTALL_PACKAGE_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
+ set(${vtk-module}-targets-build "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
endmacro()
# VTK_WRAP_PYTHON_MODULES can be used to explicitly control which modules
@@ -431,7 +431,7 @@ set(VTK_CONFIG_CODE "
set(VTK_MODULES_DIR \"${VTK_MODULES_DIR}\")")
set(VTK_CONFIG_CMAKE_DIR "${VTK_SOURCE_DIR}/CMake")
set(VTK_CONFIG_TARGETS_CONDITION " AND NOT VTK_BINARY_DIR")
-set(VTK_CONFIG_TARGETS_FILE "${VTK_BINARY_DIR}/VTKTargets.cmake")
+set(VTK_CONFIG_TARGETS_FILE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
set(VTK_CONFIG_MODULE_API_FILE "${VTK_SOURCE_DIR}/CMake/vtkModuleAPI.cmake")
# Target used to ensure VTKConfig is load just once
set(VTK_COMMON_TARGET vtkCommonCore)
@@ -467,7 +467,7 @@ set(VTK_CONFIG_CODE "${VTK_CONFIG_CODE}
set(VTK_MODULES_DIR \"\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}/Modules\")")
set(VTK_CONFIG_CMAKE_DIR "\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}")
set(VTK_CONFIG_TARGETS_CONDITION "")
-set(VTK_CONFIG_TARGETS_FILE "\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}/VTKTargets.cmake")
+set(VTK_CONFIG_TARGETS_FILE "\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
set(VTK_CONFIG_MODULE_API_FILE "\${VTK_INSTALL_PREFIX}/${VTK_INSTALL_PACKAGE_DIR}/vtkModuleAPI.cmake")
set(VTK_CONFIG_INSTALLED TRUE)
configure_file(CMake/VTKConfig.cmake.in CMakeFiles/VTKConfig.cmake @ONLY)
@@ -526,8 +526,8 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
else()
set(CMAKE_CONFIGURABLE_FILE_CONTENT "# No targets!")
configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in
- ${VTK_BINARY_DIR}/CMakeFiles/VTKTargets.cmake @ONLY)
- install(FILES ${VTK_BINARY_DIR}/CMakeFiles/VTKTargets.cmake
+ ${VTK_BINARY_DIR}/CMakeFiles/${VTK_INSTALL_EXPORT_NAME}.cmake @ONLY)
+ install(FILES ${VTK_BINARY_DIR}/CMakeFiles/${VTK_INSTALL_EXPORT_NAME}.cmake
DESTINATION ${VTK_INSTALL_PACKAGE_DIR})
endif()
endif()
--
2.7.4
--- a/VTK/CMake/vtkModuleTop.cmake
+++ b/VTK/CMake/vtkModuleTop.cmake
@@ -309,11 +309,11 @@ endforeach()
if(NOT VTK_MODULES_ENABLED)
message(WARNING "No modules enabled!")
- file(REMOVE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
+ file(REMOVE "${VTK_BINARY_DIR}/VTKTargets.cmake")
return()
endif()
-file(WRITE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake"
+file(WRITE "${VTK_BINARY_DIR}/VTKTargets.cmake"
"# Generated by CMake, do not edit!")
macro(verify_vtk_module_is_set)
@@ -326,7 +326,7 @@ macro(init_module_vars)
verify_vtk_module_is_set()
set(${vtk-module}-targets ${VTK_INSTALL_EXPORT_NAME})
set(${vtk-module}-targets-install "${VTK_INSTALL_PACKAGE_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
- set(${vtk-module}-targets-build "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
+ set(${vtk-module}-targets-build "${VTK_BINARY_DIR}/VTKTargets.cmake")
endmacro()
# VTK_WRAP_PYTHON_MODULES can be used to explicitly control which modules
@@ -431,7 +431,7 @@ set(VTK_CONFIG_CODE "
set(VTK_MODULES_DIR \"${VTK_MODULES_DIR}\")")
set(VTK_CONFIG_CMAKE_DIR "${VTK_SOURCE_DIR}/CMake")
set(VTK_CONFIG_TARGETS_CONDITION " AND NOT VTK_BINARY_DIR")
-set(VTK_CONFIG_TARGETS_FILE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
+set(VTK_CONFIG_TARGETS_FILE "${VTK_BINARY_DIR}/VTKTargets.cmake")
set(VTK_CONFIG_MODULE_API_FILE "${VTK_SOURCE_DIR}/CMake/vtkModuleAPI.cmake")
# Target used to ensure VTKConfig is load just once
set(VTK_COMMON_TARGET vtkCommonCore)
--
2.7.4
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