Use system pthread

RfidResearchGroup · Oct 17, 2023 · adfb440 · adfb440
1 parent 6e19d07
commit adfb440
Show file tree

Hide file tree

Showing 36 changed files with 5 additions and 14,828 deletions.
diff --git a/software/src/CMakeLists.txt b/software/src/CMakeLists.txt
@@ -35,36 +35,29 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 
     add_compile_options(-D_GNU_SOURCE)
 
-    find_package(Threads)
 elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
     MESSAGE(STATUS "Run on Windows.")
 
-    #  Add pthread header for Windows
-    include_directories(lib/pthread/include)
-
     # optimize
     if (CMAKE_BUILD_TYPE STREQUAL "Release")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ox")
     endif()
 
-    # pthread need
-    add_definitions(-DHAVE_STRUCT_TIMESPEC)
-
-    # find the pthread dep
-    find_library(LIBTHREAD pthreadVC2.lib lib/pthread/lib/x64/)
 else()
     MESSAGE(STATUS "other platform: ${CMAKE_SYSTEM_NAME}")
 endif()
 
+find_package(Threads)
+
 # ignore warning C4996
 add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
 
 # tools
 add_executable(nested ${COMMON_FILES} ${NESTED_UTIL} nested.c)
-target_link_libraries(nested ${LIBTHREAD})
+target_link_libraries(nested PRIVATE pthread)
 
 add_executable(staticnested ${COMMON_FILES} ${NESTED_UTIL} staticnested.c)
-target_link_libraries(staticnested ${LIBTHREAD})
+target_link_libraries(staticnested PRIVATE pthread)
 
 add_executable(darkside ${COMMON_FILES} ${MFKEY_UTIL} darkside.c)