Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream-diy' into update-to-latest-diy

Browse Source 
* upstream-diy:
  diy 2020-07-15 (4ea1241e)
This commit is contained in:
Sujin Philip 2020-07-15 15:36:03 -05:00
commit c35323ae42
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt vendored
View File

@ -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
install(EXPORT ${diy_export_name} NAMESPACE DIY:: DESTINATION "." FILE diy-targets.cmake)
install(FILES "${PROJECT_BINARY_DIR}/diy-config.cmake" DESTINATION ".")
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
View File

@ -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)

6
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/time.hpp vendored
View File

@ -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);