Gitlab.kitware.com will be offline between 8am and midnight (EST/UTC-0500) on Saturday, December 15th.

Commit 3a76e5a9 authored by Andrew Bauer's avatar Andrew Bauer

CMake improvements for the Pagosa Catalyst adaptor.

parent c4757f3c
......@@ -856,6 +856,14 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT)
endif()
#-----------------------------------------------------------------------------
if (PARAVIEW_BUILD_CATALYST_ADAPTORS AND NOT WIN32)
# BuildAdaptors.cmake builds the adaptors as a separate project. We mark is
# OPTIONAL for Catalyst packages that don't have the adaptors included.
include(${CMAKE_CURRENT_SOURCE_DIR}/CoProcessing/Adaptors/BuildAdaptors.cmake
OPTIONAL)
endif()
#-----------------------------------------------------------------------------
# Export all targets at once from the build tree in their final configuration.
# We export these again so that we add ParaView's targets to the list.
......@@ -898,15 +906,6 @@ if (BUILD_EXAMPLES)
ENDIF ()
endif()
#-----------------------------------------------------------------------------
if (PARAVIEW_BUILD_CATALYST_ADAPTORS AND NOT WIN32)
# BuildAdaptors.cmake builds the adaptors as a separate project. We mark is
# OPTIONAL for Catalyst packages that don't have the adaptors included.
include(${CMAKE_CURRENT_SOURCE_DIR}/CoProcessing/Adaptors/BuildAdaptors.cmake
OPTIONAL)
endif()
#-----------------------------------------------------------------------------
# Build doxygen documentation.
if (BUILD_DOCUMENTATION)
......
......@@ -148,11 +148,11 @@ if (PARAVIEW_ENABLE_PYTHON AND NOT WIN32)
# The Pagosa adaptor is done as part of the normal ParaView CMake configuration
# so that the library can be installed.
#------------------------------------------------------------------------------
cmake_dependent_option(BUILD_PAGOSA_ADAPTOR
cmake_dependent_option(PARAVIEW_BUILD_PAGOSA_ADAPTOR
"Build the Pagosa Catalyst Adaptor" OFF
"PARAVIEW_BUILD_CATALYST_ADAPTORS" OFF)
mark_as_advanced(BUILD_PAGOSA_ADAPTOR)
if(BUILD_PAGOSA_ADAPTOR)
mark_as_advanced(PARAVIEW_BUILD_PAGOSA_ADAPTOR)
if(PARAVIEW_BUILD_PAGOSA_ADAPTOR)
add_subdirectory(CoProcessing/Adaptors/PagosaAdaptor)
endif()
......
cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 3.3)
project(PagosaAdaptor)
set(STANDALONE_BUILD 0)
......@@ -28,11 +28,22 @@ target_link_libraries(
PagosaAdaptor vtkPVCatalyst vtkPVPythonCatalyst
)
if(PARAVIEW_INSTALL_DEVELOPMENT_FILES OR STANDALONE_BUILD)
install(TARGETS PagosaAdaptor DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT Development)
if(STANDALONE_BUILD)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PagosaAdaptorAPIMangling.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
else()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PagosaAdaptorAPIMangling.h DESTINATION ${VTK_INSTALL_INCLUDE_DIR})
endif()
set_property(GLOBAL APPEND PROPERTY VTK_TARGETS PagosaAdaptor)
if(STANDALONE_BUILD)
install(TARGETS PagosaAdaptor EXPORT PagosaAdaptorTargets
DESTINATION lib
COMPONENT Development)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PagosaAdaptorAPIMangling.h
DESTINATION include)
export(TARGETS PagosaAdaptor FILE
PagosaAdaptor.cmake)
# export(EXPORT PagosaAdaptorTargets
# FILE ${PagosaAdaptor_BINARY_DIR}/PagosaAdaptorTargets.cmake)
elseif(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
install(TARGETS PagosaAdaptor EXPORT ${PV_INSTALL_EXPORT_NAME}
DESTINATION lib
COMPONENT Development)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PagosaAdaptorAPIMangling.h
DESTINATION ${VTK_INSTALL_INCLUDE_DIR})
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