Skip to content

Commit f0821e1

Browse files
Get Windows builds working again
1 parent 952dceb commit f0821e1

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,10 @@ if (LIBDIVIDE_BUILD_TESTS)
286286

287287
add_executable(tester test/tester.cpp)
288288
add_executable(test_c99 test/test_c99.c)
289-
add_executable(test_divlu test/test_divlu.c doc/divlu.c)
290-
add_executable(benchmark_divlu test/benchmark_divlu.c doc/divlu.c)
289+
if(NOT MSVC)
290+
add_executable(test_divlu test/test_divlu.c doc/divlu.c)
291+
add_executable(benchmark_divlu test/benchmark_divlu.c doc/divlu.c)
292+
endif()
291293
add_executable(fast_div_generator test/fast_div_generator.cpp)
292294
add_executable(benchmark test/benchmark.cpp)
293295
add_executable(benchmark_branchfree test/benchmark_branchfree.cpp)
@@ -300,15 +302,19 @@ if (LIBDIVIDE_BUILD_TESTS)
300302

301303
target_compile_options(tester PRIVATE "${LIBDIVIDE_FLAGS}" "${NO_VECTORIZE}")
302304
target_compile_options(test_c99 PRIVATE "${LIBDIVIDE_FLAGS}" "${NO_VECTORIZE}")
303-
target_compile_options(test_divlu PRIVATE "${LIBDIVIDE_FLAGS}")
304-
target_compile_options(benchmark_divlu PRIVATE "${LIBDIVIDE_FLAGS}" "-Wno-pedantic")
305+
if(NOT MSVC)
306+
target_compile_options(test_divlu PRIVATE "${LIBDIVIDE_FLAGS}")
307+
target_compile_options(benchmark_divlu PRIVATE "${LIBDIVIDE_FLAGS}" "-Wno-pedantic")
308+
endif()
305309
target_compile_options(fast_div_generator PRIVATE "${LIBDIVIDE_FLAGS}" "${NO_VECTORIZE}")
306310
target_compile_options(benchmark PRIVATE "${LIBDIVIDE_FLAGS}" "${NO_VECTORIZE_C}")
307311
target_compile_options(benchmark_branchfree PRIVATE "${LIBDIVIDE_FLAGS}" "${NO_VECTORIZE}")
308312
set_property(TARGET benchmark_branchfree PROPERTY CXX_STANDARD 11)
309313
set_property(TARGET test_c99 PROPERTY C_STANDARD 99)
310-
set_property(TARGET test_divlu PROPERTY C_STANDARD 99)
311-
set_property(TARGET benchmark_divlu PROPERTY C_STANDARD 99)
314+
if(NOT MSVC)
315+
set_property(TARGET test_divlu PROPERTY C_STANDARD 99)
316+
set_property(TARGET benchmark_divlu PROPERTY C_STANDARD 11)
317+
endif()
312318

313319
target_compile_definitions(tester PRIVATE "${LIBDIVIDE_ASSERTIONS}" "${LIBDIVIDE_VECTOR_EXT}")
314320
target_compile_definitions(test_c99 PRIVATE "${LIBDIVIDE_ASSERTIONS}" "${LIBDIVIDE_VECTOR_EXT}")

test/benchmark_divlu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ typedef unsigned long long ullong;
1818

1919
static uint64_t now_ns(void) {
2020
struct timespec ts;
21-
clock_gettime(CLOCK_MONOTONIC, &ts);
21+
timespec_get(&ts, TIME_UTC);
2222
return (uint64_t)ts.tv_sec * UINT64_C(1000000000) + (uint64_t)ts.tv_nsec;
2323
}
2424

0 commit comments

Comments
 (0)