vtk-config: avoid requiring packages in shared installs

The associated targets are not actually used in the export in a shared
build, so there's no need to actually mention them.
This commit is contained in:
Ben Boeckel 2023-08-07 17:14:49 -04:00
parent 09a52a0fb0
commit 2fa10866b3
20 changed files with 38 additions and 22 deletions

View File

@ -2,7 +2,8 @@ set(classes
vtkBufferedArchiver
vtkPartitionedArchiver)
vtk_module_find_package(PACKAGE LibArchive)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE LibArchive)
vtk_module_add_module(VTK::CommonArchive
CLASSES ${classes})

View File

@ -1,4 +1,4 @@
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE Threads)
set(classes

View File

@ -1,4 +1,5 @@
vtk_module_find_package(PACKAGE GDAL)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE GDAL)
set(classes
vtkGDALRasterConverter

View File

@ -1,4 +1,4 @@
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE ADIOS2
VERSION 2.4)
if (VTK_USE_MPI AND NOT ADIOS2_HAVE_MPI)

View File

@ -1,4 +1,4 @@
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE FFMPEG
VERSION 2.3.3
FORWARD_VERSION_REQ MINOR

View File

@ -1,4 +1,5 @@
vtk_module_find_package(PACKAGE GDAL)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE GDAL)
set(classes
vtkGDAL

View File

@ -1,4 +1,5 @@
vtk_module_find_package(PACKAGE libLAS)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE libLAS)
set(classes
vtkLASReader)
@ -8,7 +9,8 @@ vtk_module_add_module(VTK::IOLAS
set(liblas_boost_dependencies)
if (libLAS_VERSION VERSION_LESS "1.8.2")
vtk_module_find_package(PACKAGE Boost
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE Boost
COMPONENTS program_options thread system iostreams filesystem
FORWARD_VERSION_REQ EXACT
VERSION_VAR "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@")

View File

@ -11,7 +11,8 @@ vtk_module_add_module(VTK::IOMySQL
CLASSES ${classes}
SOURCES ${sources})
vtk_module_find_package(PACKAGE MySQL)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE MySQL)
vtk_module_link(VTK::IOMySQL
PRIVATE
MySQL::MySQL)

View File

@ -1,4 +1,4 @@
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE OpenCASCADE
FORWARD_VERSION_REQ EXACT
VERSION_VAR "@OpenCASCADE_MAJOR_VERSION@.@OpenCASCADE_MINOR_VERSION@.@OpenCASCADE_MAINTENANCE_VERSION@"

View File

@ -6,7 +6,8 @@ vtk_module_add_module(VTK::IOODBC
CLASSES ${classes}
SOURCES vtkIOODBC_AutoInit.cxx)
vtk_module_find_package(PACKAGE ODBC)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE ODBC)
vtk_module_link(VTK::IOODBC
PRIVATE
ODBC::ODBC)

View File

@ -6,7 +6,8 @@ mark_as_advanced(OpenVDB_CMAKE_PATH)
list(INSERT CMAKE_MODULE_PATH 0
"${OpenVDB_CMAKE_PATH}")
vtk_module_find_package(PACKAGE OpenVDB)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE OpenVDB)
set(classes
vtkOpenVDBWriter

View File

@ -1,4 +1,6 @@
vtk_module_find_package(PACKAGE PDAL VERSION 2.1)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE PDAL
VERSION 2.1)
set(classes
vtkPDALReader)

View File

@ -1,4 +1,5 @@
vtk_module_find_package(PACKAGE PostgreSQL)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE PostgreSQL)
set(classes
vtkPostgreSQLDatabase

View File

@ -15,7 +15,8 @@ vtk_module_add_module(VTK::RenderingFreeTypeFontConfig
SOURCES ${vtk_object_factory_source}
PRIVATE_HEADERS ${vtk_object_factory_header})
vtk_module_find_package(PACKAGE FontConfig)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE FontConfig)
vtk_module_link(VTK::RenderingFreeTypeFontConfig
PRIVATE
FontConfig::FontConfig)

View File

@ -415,7 +415,8 @@ elseif (VTK_USE_COCOA)
vtk_module_link(VTK::RenderingOpenGL2 PUBLIC "-framework Cocoa")
elseif (VTK_USE_WIN32_OPENGL)
# vtkWin32OpenGLDXRenderWindow requires D3D.
vtk_module_find_package(PACKAGE DirectX)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE DirectX)
vtk_module_link(VTK::RenderingOpenGL2 PRIVATE DirectX::d3d11 DirectX::dxgi)
endif ()

View File

@ -56,7 +56,7 @@ vtk_module_add_module(VTK::RenderingRayTracing
PRIVATE_HEADERS ${vtk_object_factory_header})
if (VTK_ENABLE_OSPRAY)
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE ospray
VERSION 2.1)
@ -65,7 +65,7 @@ if (VTK_ENABLE_OSPRAY)
ospray::ospray
)
if (VTKOSPRAY_ENABLE_DENOISER)
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE OpenImageDenoise
FORWARD_VERSION_REQ MINOR)
vtk_module_definitions(VTK::RenderingRayTracing

View File

@ -156,7 +156,8 @@ vtk_module_add_module(VTK::RenderingUI
)
if (VTK_USE_SDL2 OR CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
vtk_module_find_package(PACKAGE SDL2)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE SDL2)
vtk_module_link(VTK::RenderingUI
PRIVATE
SDL2::SDL2)

View File

@ -52,7 +52,8 @@ vtk_object_factory_configure(
EXPORT_MACRO "VTKRENDERINGVR_EXPORT")
if (VTK_ENABLE_VR_COLLABORATION)
vtk_module_find_package(PACKAGE ZeroMQ)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE ZeroMQ)
list(APPEND classes vtkVRCollaborationClient)
endif()

View File

@ -242,7 +242,8 @@ else()
"utils_metal.mm"
)
endif()
vtk_module_find_package(PACKAGE SDL2)
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE SDL2)
vtk_module_find_package(PACKAGE Dawn)
vtk_module_compile_features(VTK::RenderingWebGPU
PUBLIC

View File

@ -8,7 +8,7 @@ set(classes
vtkQtView)
include(vtkQt)
vtk_module_find_package(
vtk_module_find_package(PRIVATE_IF_SHARED
PACKAGE "Qt${vtk_qt_major_version}"
COMPONENTS Widgets
FORWARD_VERSION_REQ MINOR