diff --git a/3rdparty/apriltag/CMakeLists.txt b/3rdparty/apriltag/CMakeLists.txt index 07e8e583c8..5191919cc1 100644 --- a/3rdparty/apriltag/CMakeLists.txt +++ b/3rdparty/apriltag/CMakeLists.txt @@ -23,10 +23,8 @@ if(NOT WITH_APRILTAG_BIG_FAMILY) vp_list_filterout(lib_hdrs tagStandard52h13.h) endif() -if (WIN32) - if(NOT MINGW) - vp_list_filterout(lib_srcs pthreads_cross.c) - endif() +if(NOT (WIN32 AND NOT MINGW)) + vp_list_filterout(lib_srcs pthreads_cross.c) endif() if(UNIX) @@ -75,6 +73,7 @@ if(MSVC) vp_set_source_file_compile_flag(common/pthreads_cross.c /wd4068 /wd4244) vp_set_source_file_compile_flag(common/string_util.c /wd4018 /wd4267 /wd4996) vp_set_source_file_compile_flag(common/time_util.c /wd4244) + vp_set_source_file_compile_flag(common/times.c /wd4244) vp_set_source_file_compile_flag(common/workerpool.c /wd4018 /wd4244) vp_set_source_file_compile_flag(common/zmaxheap.c /wd4098 /wd4244) vp_set_source_file_compile_flag(apriltag.c /wd4244) @@ -83,7 +82,7 @@ if(MSVC) vp_set_source_file_compile_flag(tag16h5.c /wd4996 /wd4244) vp_set_source_file_compile_flag(tag25h7.c /wd4996 /wd4244) vp_set_source_file_compile_flag(tag25h9.c /wd4996 /wd4244) - vp_set_source_file_compile_flag(tag36h10.c /wd499 /wd42446) + vp_set_source_file_compile_flag(tag36h10.c /wd4996 /wd42446) vp_set_source_file_compile_flag(tag36h11.c /wd4996 /wd4244) vp_set_source_file_compile_flag(tagCircle21h7.c /wd4996 /wd4244) # disable optimization