Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable delayed loading of VTK libraries on Windows #5642

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable delayed loading of VTK libraries on Windows #5642

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
decdf80
Enable delayed loading of VTK libraries on Windows
CSBVision Mar 27, 2023
934eea9
Extend pcl_find_vtk.cmake for Ninja generators
CSBVision Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions cmake/pcl_find_vtk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
function(checkVTKComponents)
cmake_parse_arguments(ARGS "" "MISSING_COMPONENTS" "COMPONENTS" ${ARGN})

if(ARGS_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "Unknown arguments given to checkVTKComponents: ${ARGS_UNPARSED_ARGUMENTS}")
endif()

set(vtkMissingComponents)

foreach(vtkComponent ${ARGS_COMPONENTS})
if (VTK_VERSION VERSION_LESS 9.0)
if (NOT TARGET ${vtkComponent})
Expand All @@ -18,7 +18,7 @@ function(checkVTKComponents)
endif()
endif()
endforeach()

if(ARGS_MISSING_COMPONENTS)
set(${ARGS_MISSING_COMPONENTS} ${vtkMissingComponents} PARENT_SCOPE)
endif()
Expand Down Expand Up @@ -96,6 +96,19 @@ if (vtkMissingComponents)
message(FATAL_ERROR "Missing vtk modules: ${vtkMissingComponents}")
endif()

if(MSVC AND PCL_SHARED_LIBS)
option(VTK_ENABLE_DELAYLOAD "Enable delayed loading of VTK DLLs" TRUE)
if(VTK_ENABLE_DELAYLOAD)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} delayimp.lib")
file(GLOB VTK_DLLS "${VTK_DIR}/../../../bin/*.dll")
foreach(d ${VTK_DLLS})
cmake_path(GET "d" FILENAME DLL_NAME)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:${DLL_NAME}")
endforeach()
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4199")
endif()
endif()

if("vtkGUISupportQt" IN_LIST VTK_MODULES_ENABLED)
set(HAVE_QVTK TRUE)
#PCL_VTK_COMPONENTS is used in the PCLConfig.cmake to refind the required modules.
Expand All @@ -118,7 +131,7 @@ if(PCL_SHARED_LIBS OR (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS)))
include(${VTK_USE_FILE})
endif()
endif()

if(APPLE)
option(VTK_USE_COCOA "Use Cocoa for VTK render windows" ON)
mark_as_advanced(VTK_USE_COCOA)
Expand Down
Loading