d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'podsvirov-win-threads' into fixes

Browse Source
This commit is contained in:
Roger A. Light 2022-02-24 18:55:48 +00:00
commit ffe952f9c7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -67,12 +67,18 @@ option(WITH_THREADING "Include client library threading support?" ON)
if (WITH_THREADING) if (WITH_THREADING)
add_definitions("-DWITH_THREADING") add_definitions("-DWITH_THREADING")
if (WIN32) if (WIN32)
if (CMAKE_CL_64) if (CMAKE_VERSION VERSION_LESS "3.1")
set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib) if (CMAKE_CL_64)
else (CMAKE_CL_64) set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib) else (CMAKE_CL_64)
endif (CMAKE_CL_64) set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include) endif (CMAKE_CL_64)
set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
else()
find_package(Threads REQUIRED)
set (PTHREAD_LIBRARIES Threads::Threads)
set (PTHREAD_INCLUDE_DIR "")
endif()
elseif (ANDROID) elseif (ANDROID)
set (PTHREAD_LIBRARIES "") set (PTHREAD_LIBRARIES "")
set (PTHREAD_INCLUDE_DIR "") set (PTHREAD_INCLUDE_DIR "")