Skip to content
Snippets Groups Projects
Commit aba91a6e authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'license-install-destination' into release


de5f351a cmake: use a single variable for the license destination

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6877
parents b44dcfde de5f351a
No related branches found
No related tags found
No related merge requests found
......@@ -63,6 +63,14 @@ include(vtkWrapSettings)
include(vtkCrossCompiling)
include(vtkObjectFactory)
set(CMAKE_INSTALL_LICENSEDIR ""
CACHE PATH "License files (DATAROOTDIR/licenses/${CMAKE_PROJECT_NAME}")
mark_as_advanced(CMAKE_INSTALL_LICENSEDIR)
if (NOT CMAKE_INSTALL_LICENSEDIR)
set(CMAKE_INSTALL_LICENSEDIR
"${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}")
endif ()
# Setup compiler flags for dynamic analysis
# Should be included after vtkTesting
include(vtkCompilerDynamicAnalysisFlags)
......@@ -318,6 +326,7 @@ vtk_module_build(
HEADERS_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vtk${vtk_version_suffix}"
${vtk_hierarchy_destination_args}
CMAKE_DESTINATION "${vtk_cmake_destination}"
LICENSE_DESTINATION "${CMAKE_INSTALL_LICENSEDIR}"
LIBRARY_NAME_SUFFIX "${VTK_CUSTOM_LIBRARY_SUFFIX}"
VERSION "${VTK_VERSION}"
SOVERSION "1"
......@@ -449,7 +458,7 @@ endif ()
install(
FILES "${CMAKE_CURRENT_LIST_DIR}/Copyright.txt"
DESTINATION "${CMAKE_INSTALL_DOCDIR}"
DESTINATION "${CMAKE_INSTALL_LICENSEDIR}"
COMPONENT "license")
# TODO: HeaderTest exclusions for memcheck.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment