Merge topic 'update-to-latest-diy'
c35323ae4 Merge branch 'upstream-diy' into update-to-latest-diy ec6fef447 diy 2020-07-15 (4ea1241e) 78221a09e Update diy tag name Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !2182
This commit is contained in:
commit
f88bccde08
2
vtkm/thirdparty/diy/update.sh
vendored
2
vtkm/thirdparty/diy/update.sh
vendored
@ -8,7 +8,7 @@ readonly name="diy"
|
||||
readonly ownership="Diy Upstream <kwrobot@kitware.com>"
|
||||
readonly subtree="vtkm/thirdparty/$name/vtkm$name"
|
||||
readonly repo="https://gitlab.kitware.com/third-party/diy2.git"
|
||||
readonly tag="for/vtk-m-20200701-master"
|
||||
readonly tag="for/vtk-m-20200715-master"
|
||||
readonly paths="
|
||||
cmake
|
||||
include
|
||||
|
2
vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
vendored
2
vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt
vendored
@ -251,8 +251,8 @@ endif()
|
||||
|
||||
install(TARGETS ${diy_targets} EXPORT ${diy_export_name} DESTINATION ${diy_install_lib_dir})
|
||||
|
||||
export(EXPORT ${diy_export_name} NAMESPACE DIY:: FILE "${PROJECT_BINARY_DIR}/diy-targets.cmake")
|
||||
if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # Only generate these files when diy is the main project
|
||||
export(EXPORT ${diy_export_name} NAMESPACE DIY:: FILE "${PROJECT_BINARY_DIR}/diy-targets.cmake")
|
||||
install(EXPORT ${diy_export_name} NAMESPACE DIY:: DESTINATION "." FILE diy-targets.cmake)
|
||||
install(FILES "${PROJECT_BINARY_DIR}/diy-config.cmake" DESTINATION ".")
|
||||
endif()
|
||||
|
6
vtkm/thirdparty/diy/vtkmdiy/README.md
vendored
6
vtkm/thirdparty/diy/vtkmdiy/README.md
vendored
@ -28,6 +28,12 @@ DIY is a header-only library. It does not need to be built; you can simply
|
||||
include it in your project. The examples can be built using `cmake` from the
|
||||
top-level directory.
|
||||
|
||||
## Development
|
||||
|
||||
Development happens in the [DIY repo](https://gitlab.kitware.com/diatomic/diy)
|
||||
on Kitware's GitLab. Please submit merge requests there. Issues should
|
||||
be submitted in the GitHub repo.
|
||||
|
||||
## Documentation
|
||||
|
||||
[Doxygen pages](https://diatomic.github.io/diy)
|
||||
|
@ -3,10 +3,10 @@
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <sys/time.h>
|
||||
#ifdef __MACH__
|
||||
#if defined(__MACH__) && defined(__APPLE__)
|
||||
#include <mach/clock.h>
|
||||
#include <mach/mach.h>
|
||||
#endif // __MACH__
|
||||
#endif // __MACH__ && __APPLE__
|
||||
#endif // ifndef _WIN32
|
||||
|
||||
namespace diy
|
||||
@ -16,7 +16,7 @@ typedef unsigned long time_type;
|
||||
|
||||
inline time_type get_time()
|
||||
{
|
||||
#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
|
||||
#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time
|
||||
clock_serv_t cclock;
|
||||
mach_timespec_t ts;
|
||||
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
|
||||
|
Loading…
Reference in New Issue
Block a user