From df70e00117e451d720186daea7343f258513627f Mon Sep 17 00:00:00 2001 From: Thomas Prampart Date: Thu, 2 Jun 2022 19:36:46 +0200 Subject: [PATCH] Fix pthread timespec redefinition --- cmake-modules/FindThirdPartyPThread.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake-modules/FindThirdPartyPThread.cmake b/cmake-modules/FindThirdPartyPThread.cmake index b6b9a34f2..4c08af0ce 100644 --- a/cmake-modules/FindThirdPartyPThread.cmake +++ b/cmake-modules/FindThirdPartyPThread.cmake @@ -23,7 +23,10 @@ IF(WIN32) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${WS232_LIB}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PTHREAD_LIB}) INSTALL(PROGRAMS "${PTHREAD_DLL}" DESTINATION ${DIST_BINDIR}) - ADD_DEFINITIONS(-DTARGET_HAS_PThread) + ADD_DEFINITIONS(-DTARGET_HAS_PThread) + if (MSVC_VERSION GREATER_EQUAL 1900) + ADD_DEFINITIONS("-DHAVE_STRUCT_TIMESPEC") # Avoid Pthread to redefine timespec + endif() ELSE() OV_PRINT(OV_PRINTED " FAILED to find PThreads") ENDIF() -- GitLab