Commit 8082c210 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'fix-diy-installation'

b75faf9d Merge branch 'upstream-diy2' into fix-diy-installation
713a26f4 diy2 2018-09-24 (3298ccb3)
c7e6181e diy2: update the snapshot to use
248cf8a3 diy2: fix mangling
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !4702
parents 35ae717d b75faf9d
......@@ -8,7 +8,7 @@ readonly name="diy2"
readonly ownership="Diy2 Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/diy2.git"
readonly tag="for/vtk-20180918-g8359566d"
readonly tag="for/vtk-20180924-g3298ccb3"
readonly paths="
.gitattributes
CMakeLists.vtk.txt
......@@ -22,7 +22,7 @@ README.kitware.md
extract_source () {
git_archive
pushd "$extractdir/$name-reduced"
mv include/diy include/vtkdiy
mv include/diy include/vtkdiy2
mv CMakeLists.vtk.txt CMakeLists.txt
popd
}
......
......@@ -25,7 +25,7 @@
#ifndef VTK_USE_SYSTEM_DIY2
# define VTK_DIY2_HEADER(header) VTK_DIY2_QUOTE_HEADER_NAME(header)
# define diy vtkdiy // mangle namespace diy
# define diy vtkdiy2 // mangle namespace diy
#else
# define VTK_DIY2_HEADER(header) #header
#endif
......
if (NOT VTK_INSTALL_NO_DEVELOPMENT)
install(DIRECTORY include
install(DIRECTORY include/vtkdiy2/
DESTINATION "${VTK_INSTALL_INCLUDE_DIR}/vtkdiy2"
COMPONENT Development)
endif()
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