Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Michael Migliore
VTK
Commits
d522893d
Commit
d522893d
authored
Oct 02, 2017
by
Allison Vacanti
Browse files
Add version info to vtkm installation.
Updated baseline due to unrelated marching cube changes while bumping vtkm.
parent
bc9a09db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Accelerators/Vtkm/Testing/Data/Baseline/TestVTKMMarchingCubes.png.md5
View file @
d522893d
125c8c3ec6a377a8b927f312a2e480b9
062bfe334de84b57686e9bdd7432fcbc
ThirdParty/vtkm/CMakeLists.txt
View file @
d522893d
...
...
@@ -15,13 +15,20 @@ set(VTKm_ENABLE_TESTING OFF CACHE BOOL "Disabled when building as part of VTK" F
set
(
VTKm_ENABLE_RENDERING OFF CACHE BOOL
"Disabled when building as part of VTK"
FORCE
)
set
(
VTKm_USE_64BIT_IDS
${
VTK_USE_64BIT_IDS
}
CACHE BOOL
"Set to match VTK"
FORCE
)
set
(
lib_suffix
"-vtk
${
VTK_MAJOR_VERSION
}
.
${
VTK_MINOR_VERSION
}
"
)
if
(
VTK_CUSTOM_LIBRARY_SUFFIX
)
set
(
lib_suffix
"
${
VTK_CUSTOM_LIBRARY_SUFFIX
}
"
)
endif
()
if
(
WIN32
)
# Force the dlls to be in the bin folder with VTK's so that running tests
# don't need to set path on Windows
set
(
VTKm_EXECUTABLE_OUTPUT_PATH
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
"
CACHE PATH
"Set to match VTK"
FORCE
)
endif
()
set
(
VTKm_INSTALL_INCLUDE_DIR
"include/vtk-
${
VTK_MAJOR_VERSION
}
.
${
VTK_MINOR_VERSION
}
"
)
set
(
VTKm_INSTALL_CMAKE_MODULE_DIR
"lib/cmake/vtk-
${
VTK_MAJOR_VERSION
}
.
${
VTK_MINOR_VERSION
}
/vtkm"
)
set
(
VTKm_INSTALL_INCLUDE_DIR
"
${
VTK_INSTALL_INCLUDE_DIR
}
"
)
set
(
VTKm_INSTALL_CMAKE_MODULE_DIR
"
${
VTK_INSTALL_PACKAGE_DIR
}
/vtkm"
)
set
(
VTKm_INSTALL_CONFIG_DIR
"
${
VTK_INSTALL_PACKAGE_DIR
}
/vtkm"
)
set
(
VTKm_CUSTOM_LIBRARY_SUFFIX
"
${
lib_suffix
}
"
)
set
(
vtkm_LIBRARIES vtkm vtkm_cont
)
vtk_module_export_info
()
...
...
@@ -32,6 +39,4 @@ vtk_target_export(vtkm_cont)
set
(
vtkm_INCLUDE_DIRS
${
CMAKE_CURRENT_BINARY_DIR
}
/vtk-m/include
)
set_target_properties
(
vtkm PROPERTIES INTERFACE_LINK_LIBRARIES vtkm_cont
)
vtk-m
@
5ec29128
Compare
fb6be281
...
5ec29128
Subproject commit
fb6be2819d4a4a59a84bef5485d22a902623fdd9
Subproject commit
5ec29128dea2fde7e923d6a7ea3be5827c6523f7
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment