Commit 28790516 authored by Alvaro Sanchez's avatar Alvaro Sanchez

Fix CMake configuration warnings.

`PV_INSTALL_PLUGIN_DIR` is no longer supported as of ParaView 5.5, using
`PARAVIEW_INSTALL_PLUGINS_DIR` instead.
parent 0f79a208
Pipeline #87221 failed with stage
...@@ -13,7 +13,7 @@ set (ConceptualModelBuilder_SOURCE_DIR @ConceptualModelBuilder_SOURCE_DIR@) ...@@ -13,7 +13,7 @@ set (ConceptualModelBuilder_SOURCE_DIR @ConceptualModelBuilder_SOURCE_DIR@)
set (ParaView_DIR "@ParaView_DIR@") set (ParaView_DIR "@ParaView_DIR@")
set (SMTK_ROOT_DIR "@SMTK_ROOT_DIR@") set (SMTK_ROOT_DIR "@SMTK_ROOT_DIR@")
set (SMTK_INCLUDE_DIR "@SMTK_INCLUDE_DIR@") set (SMTK_INCLUDE_DIR "@SMTK_INCLUDE_DIR@")
set (PV_INSTALL_PLUGIN_DIR "@PV_INSTALL_PLUGIN_DIR@") set (PARAVIEW_INSTALL_PLUGINS_DIR "@PARAVIEW_INSTALL_PLUGINS_DIR@")
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Setup the cmake search paths # Setup the cmake search paths
...@@ -66,5 +66,5 @@ include(${SMTK_ROOT_DIR}/lib/SMTK-targets.cmake) ...@@ -66,5 +66,5 @@ include(${SMTK_ROOT_DIR}/lib/SMTK-targets.cmake)
#helper function to install plugins #helper function to install plugins
function(cmb_install_plugin target) function(cmb_install_plugin target)
install(TARGETS ${target} DESTINATION ${PV_INSTALL_PLUGIN_DIR} ) install(TARGETS ${target} DESTINATION ${PARAVIEW_INSTALL_PLUGINS_DIR} )
endfunction() endfunction()
...@@ -29,11 +29,11 @@ if(NOT VTK_INSTALL_EXPORT_NAME) ...@@ -29,11 +29,11 @@ if(NOT VTK_INSTALL_EXPORT_NAME)
set(VTK_INSTALL_EXPORT_NAME CMBTargets) set(VTK_INSTALL_EXPORT_NAME CMBTargets)
endif() endif()
if(NOT PV_INSTALL_PLUGIN_DIR) if(NOT PARAVIEW_INSTALL_PLUGINS_DIR)
if(WIN32) if(WIN32)
set (PV_INSTALL_PLUGIN_DIR ${VTK_INSTALL_RUNTIME_DIR}) set (PARAVIEW_INSTALL_PLUGINS_DIR ${VTK_INSTALL_RUNTIME_DIR})
else () else ()
set (PV_INSTALL_PLUGIN_DIR ${VTK_INSTALL_LIBRARY_DIR}) set (PARAVIEW_INSTALL_PLUGINS_DIR ${VTK_INSTALL_LIBRARY_DIR})
endif() endif()
endif() endif()
...@@ -114,7 +114,7 @@ if (APPLE) ...@@ -114,7 +114,7 @@ if (APPLE)
CACHE PATH CACHE PATH
"Location where the *.app bundle must be installed.") "Location where the *.app bundle must be installed.")
set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Libraries") set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Libraries")
set(PV_INSTALL_PLUGIN_DIR "Plugins") set(PARAVIEW_INSTALL_PLUGINS_DIR "Plugins")
endif() endif()
#helper function to install plugins #helper function to install plugins
...@@ -134,6 +134,6 @@ function(cmb_install_plugin target) ...@@ -134,6 +134,6 @@ function(cmb_install_plugin target)
) )
endforeach() endforeach()
else() else()
install(TARGETS ${target} DESTINATION ${PV_INSTALL_PLUGIN_DIR} ) install(TARGETS ${target} DESTINATION ${PARAVIEW_INSTALL_PLUGINS_DIR} )
endif() endif()
endfunction() endfunction()
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