Commit f71b5da1 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'vtktarget-export-fix' into master

2ed983af Replace VTKConfig.cmake guard variable with VTK target
parents 180d2bd9 2ed983af
......@@ -30,8 +30,7 @@ set(VTK_MODULES_ENABLED "@VTK_CONFIG_MODULES_ENABLED@")
# Import VTK targets.
set(VTK_CONFIG_TARGETS_FILE "@VTK_CONFIG_TARGETS_FILE@")
if(NOT VTK_TARGETS_IMPORTED@VTK_CONFIG_TARGETS_CONDITION@)
set(VTK_TARGETS_IMPORTED 1)
if(NOT TARGET @VTK_COMMON_TARGET@)
include("${VTK_CONFIG_TARGETS_FILE}")
endif()
......
......@@ -223,6 +223,8 @@ set(VTK_CONFIG_CMAKE_DIR "${VTK_SOURCE_DIR}/CMake")
set(VTK_CONFIG_TARGETS_CONDITION " AND NOT VTK_BINARY_DIR")
set(VTK_CONFIG_TARGETS_FILE "${VTK_BINARY_DIR}/VTKTargets.cmake")
set(VTK_CONFIG_MODULE_API_FILE "${VTK_SOURCE_DIR}/CMake/vtkModuleAPI.cmake")
# Target used to ensure VTKConfig is load just once
set(VTK_COMMON_TARGET vtkCommonCore)
configure_file(CMake/VTKConfig.cmake.in VTKConfig.cmake @ONLY)
# Generate VTKConfig.cmake for the install tree.
......
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