Commit 489326f1 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

paraview: pass variables down

Bettern than relying on the working directory of the script.
parent 19feca2d
......@@ -189,7 +189,9 @@ if (paraview_install_development_files)
if (SED_EXECUTABLE)
superbuild_project_add_step("fixupcmakepaths"
COMMAND "${CMAKE_COMMAND}"
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/paraview.fixupcmakepaths.cmake"
-Dinstall_location:PATH=<INSTALL_DIR>
-Dparaview_version:STRING=${paraview_version}
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/paraview.fixupcmakepaths.cmake"
DEPENDEES install
WORKING_DIRECTORY <INSTALL_DIR>)
endif ()
......
file(GLOB pv_cmake_dir "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/paraview-*")
file(GLOB pv_cmake_dir "${install_location}/lib/cmake/paraview-${paraview_version}")
file(GLOB cmake_files
"${pv_cmake_dir}/ParaViewTargets*.cmake"
"${pv_cmake_dir}/VTKConfig.cmake")
......@@ -15,7 +15,7 @@ foreach (cmake_file IN LISTS cmake_files)
execute_process(
COMMAND
${sed_cmd_prefix}
-e "s|${CMAKE_CURRENT_BINARY_DIR}|\${_IMPORT_PREFIX}|g"
-e "s|${install_location}|\${_IMPORT_PREFIX}|g"
${sed_cmd_suffix}
"${cmake_file}"
RESULT_VARIABLE RES)
......@@ -28,7 +28,7 @@ set(cmake_file "${pv_cmake_dir}/Modules/vtkCommonCore.cmake")
execute_process(
COMMAND
${sed_cmd_prefix}
-e "s|${CMAKE_CURRENT_BINARY_DIR}|\${VTK_INSTALL_PREFIX}|g"
-e "s|${install_location}|\${VTK_INSTALL_PREFIX}|g"
${sed_cmd_suffix}
"${cmake_file}"
RESULT_VARIABLE RES)
......
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