Commit 986101c1 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'catalyst-cmake-api-usage'

64cde886

 catalyst: transport Catalyst API variables around
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Tested-by: Ethan Stam's avatarEthan Stam <ethan.stam@gmail.com>
Merge-request: !5010
parents a8de5a27 64cde886
Pipeline #234733 failed with stages
in 278 minutes and 5 seconds
......@@ -28,6 +28,11 @@ endif ()
set_property(GLOBAL PROPERTY paraview_catalyst_directory "${catalyst_library_destination}")
# Transport the variable needed for Catalyst's CMake API from
# `ThirdParty/catalyst/CMakeLists.txt`.
get_property(_catalyst_macro_directory GLOBAL
PROPERTY paraview_catalyst_macro_directory)
catalyst_implementation(
NAME paraview
TARGET catalyst-paraview
......
......@@ -33,3 +33,16 @@ vtk_module_third_party_internal(
LICENSE_FILES "vtkcatalyst/catalyst/License.txt"
SUBDIRECTORY vtkcatalyst
INTERFACE)
# Store the variable we need for Catalyst implementations inside of ParaView.
# This is needed because the `find_package(catalyst)` isn't at the right scope
# for its usage in ParaView's minimum CMake version. This (and usages of
# `paraview_catalyst_macro_directory`) can be removed once CMake 3.17 is
# required.
if (VTK_MODULE_USE_EXTERNAL_ParaView_catalyst)
set_property(GLOBAL PROPERTY
paraview_catalyst_macro_directory "${_catalyst_macro_directory}")
else ()
set_property(GLOBAL PROPERTY
paraview_catalyst_macro_directory "${CMAKE_CURRENT_SOURCE_DIR}/vtkcatalyst/catalyst/cmake")
endif ()
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