Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-08 11:29:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream-diy' into fix-use-c++14-in-every-target

Browse Source 
# By Diy Upstream
* upstream-diy:
  diy 2021-04-12 (bc7dcda5)
This commit is contained in:
Vicente Adolfo Bolea Sanchez 2021-04-12 13:45:01 -04:00
commit ff84915bc3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ function(add_diy_mpi_library use_mpi)
add_library(${lib_name} ${sources}) add_library(${lib_name} ${sources})
set_target_properties(${lib_name} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${lib_name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_features(${lib_name} PRIVATE cxx_std_11) target_compile_features(${lib_name} PRIVATE cxx_std_14)
target_compile_definitions(${lib_name} target_compile_definitions(${lib_name}
PRIVATE -DVTKMDIY_HAS_MPI=${has_mpi_val} PRIVATE -DVTKMDIY_HAS_MPI=${has_mpi_val}
PRIVATE -Ddiy=${diy_prefix} # mangle diy namespace PRIVATE -Ddiy=${diy_prefix} # mangle diy namespace
@ -186,7 +186,7 @@ if (build_diy_mpi_lib)
endif() # build_diy_mpi_lib endif() # build_diy_mpi_lib
add_library(${diy_prefix} INTERFACE) add_library(${diy_prefix} INTERFACE)
target_compile_features(${diy_prefix} INTERFACE cxx_std_11) target_compile_features(${diy_prefix} INTERFACE cxx_std_14)
target_compile_definitions(${diy_prefix} INTERFACE ${diy_definitions}) target_compile_definitions(${diy_prefix} INTERFACE ${diy_definitions})
target_include_directories(${diy_prefix} SYSTEM INTERFACE target_include_directories(${diy_prefix} SYSTEM INTERFACE
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"

2
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/fmt/format.h vendored
View File

@ -850,7 +850,7 @@ inline Char* format_uint(Char* buffer, UInt value, int num_digits,
buffer += num_digits; buffer += num_digits;
Char* end = buffer; Char* end = buffer;
do { do {
const char* digits = upper ? "0123456789ABCDEF" : data::hex_digits; const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef";
unsigned digit = (value & ((1 << BASE_BITS) - 1)); unsigned digit = (value & ((1 << BASE_BITS) - 1));
*--buffer = static_cast<Char>(BASE_BITS < 4 ? static_cast<char>('0' + digit) *--buffer = static_cast<Char>(BASE_BITS < 4 ? static_cast<char>('0' + digit)
: digits[digit]); : digits[digit]);