Commit 3b1ec0f0 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'vtk-targets-file'

b5787491 cmake: export to the right filename
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King's avatarBrad King <brad.king@kitware.com>
Acked-by: Chuck Atkins's avatarChuck Atkins <chuck.atkins@kitware.com>
Merge-request: !2658
parents 2e62b5bf b5787491
......@@ -309,11 +309,11 @@ endforeach()
if(NOT VTK_MODULES_ENABLED)
message(WARNING "No modules enabled!")
file(REMOVE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
file(REMOVE "${VTK_BINARY_DIR}/VTKTargets.cmake")
return()
endif()
file(WRITE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake"
file(WRITE "${VTK_BINARY_DIR}/VTKTargets.cmake"
"# Generated by CMake, do not edit!")
macro(verify_vtk_module_is_set)
......@@ -326,7 +326,7 @@ macro(init_module_vars)
verify_vtk_module_is_set()
set(${vtk-module}-targets ${VTK_INSTALL_EXPORT_NAME})
set(${vtk-module}-targets-install "${VTK_INSTALL_PACKAGE_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
set(${vtk-module}-targets-build "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
set(${vtk-module}-targets-build "${VTK_BINARY_DIR}/VTKTargets.cmake")
endmacro()
# VTK_WRAP_PYTHON_MODULES can be used to explicitly control which modules
......@@ -431,7 +431,7 @@ set(VTK_CONFIG_CODE "
set(VTK_MODULES_DIR \"${VTK_MODULES_DIR}\")")
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}/${VTK_INSTALL_EXPORT_NAME}.cmake")
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)
......
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