Commit efa7a41f authored by Ben Boeckel's avatar Ben Boeckel
Browse files

paraview-config: don't unset helper variables

While the original goal was to not pollute the caller's scope with
excess variables, nothing is done about the *other* variables exported
by transitive `find_package` calls. Instead, just let them go.
parent 510818dc
Pipeline #143760 running with stage
......@@ -8,7 +8,6 @@ function (_paraview_package_append_variables)
string(APPEND _paraview_package_variables
"if (NOT DEFINED \"${var}\")
set(\"${var}\" \"${${var}}\")
list(APPEND _paraview_find_package_variables \"${var}\")
elseif (NOT ${var})
set(\"${var}\" \"${${var}}\")
endif ()
......
......@@ -49,17 +49,9 @@ unset(_paraview_use_external_vtk)
include("${CMAKE_CURRENT_LIST_DIR}/${CMAKE_FIND_PACKAGE_NAME}-targets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/${CMAKE_FIND_PACKAGE_NAME}-vtk-module-properties.cmake")
set(_paraview_find_package_variables)
include("${CMAKE_CURRENT_LIST_DIR}/paraview-find-package-helpers.cmake" OPTIONAL)
include("${CMAKE_CURRENT_LIST_DIR}/${CMAKE_FIND_PACKAGE_NAME}-vtk-module-find-packages.cmake")
foreach (_paraview_find_package_variable IN LISTS _paraview_find_package_variables)
unset("${_paraview_find_package_variable}")
endforeach ()
unset(_paraview_find_package_variable)
unset(_paraview_find_package_variables)
include("${CMAKE_CURRENT_LIST_DIR}/ParaViewClient.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/ParaViewPlugin.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/ParaViewServerManager.cmake")
......
Markdown is supported
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