Skip to content
Snippets Groups Projects
Commit ef6aa20e authored by Ben Boeckel's avatar Ben Boeckel
Browse files

vtk-config: clarify VTK_PREFIX_PATH

Nothing added other prefixes and the helpers now make the extra logic
unnecessary.
parent 808ec0ef
No related branches found
No related tags found
No related merge requests found
Pipeline #151237 passed
......@@ -11,8 +11,7 @@ The following variables are provided by this module:
* `VTK_MINOR_VERSION`: The minor version of VTK found.
* `VTK_BUILD_VERSION`: The build version of VTK found.
* `VTK_AVAILABLE_COMPONENTS`: Components available with VTK.
* `VTK_PREFIX_PATH`: Install prefixes for VTK. May include additional paths
for other prefixes.
* `VTK_PREFIX_PATH`: Install prefix for VTK.
* `VTK_LEGACY_REMOVE`: Whether VTK's deprecated APIs are
compiled out or not.
* `VTK_HAS_VTKm`: If VTK provides VTK-m.
......@@ -98,8 +97,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/vtk-prefix.cmake")
set("${CMAKE_FIND_PACKAGE_NAME}_PREFIX_PATH"
"${_vtk_module_import_prefix}")
unset(_vtk_module_import_prefix)
list(APPEND "${CMAKE_FIND_PACKAGE_NAME}_PREFIX_PATH"
@vtk_prefix_paths@)
list(INSERT CMAKE_PREFIX_PATH 0
${${CMAKE_FIND_PACKAGE_NAME}_PREFIX_PATH})
......
......@@ -21,8 +21,6 @@ endif ()
_vtk_module_write_import_prefix("${vtk_cmake_build_dir}/vtk-prefix.cmake" "${vtk_cmake_destination}")
set(vtk_prefix_paths)
set(vtk_python_version "")
if (VTK_WRAP_PYTHON)
set(vtk_python_version "${VTK_PYTHON_VERSION}")
......@@ -33,14 +31,6 @@ configure_file(
"${vtk_cmake_build_dir}/vtk-config.cmake"
@ONLY)
if (NOT DEFINED VTK_RELOCATABLE_INSTALL)
option(VTK_RELOCATABLE_INSTALL "Do not embed hard-coded paths into the install" ON)
mark_as_advanced(VTK_RELOCATABLE_INSTALL)
endif ()
if (VTK_RELOCATABLE_INSTALL)
set(vtk_prefix_paths)
endif ()
configure_file(
"${vtk_cmake_dir}/vtk-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/vtk-config.cmake"
......@@ -140,6 +130,11 @@ foreach (vtk_cmake_module_file IN LISTS vtk_cmake_module_files vtk_cmake_patch_f
endforeach ()
include(vtkInstallCMakePackageHelpers)
if (NOT DEFINED VTK_RELOCATABLE_INSTALL)
option(VTK_RELOCATABLE_INSTALL "Do not embed hard-coded paths into the install" ON)
mark_as_advanced(VTK_RELOCATABLE_INSTALL)
endif ()
if (NOT VTK_RELOCATABLE_INSTALL)
list(APPEND vtk_cmake_files_to_install
"${vtk_cmake_build_dir}/vtk-find-package-helpers.cmake")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment