Fix pthreads linking on Windows for libmosquitto_static

Closes #3143
eclipse-mosquitto · Oct 30, 2024 · 67ef993 · 67ef993
1 parent e99a97b
commit 67ef993
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,14 @@
+2.0.21 - 2024-xx-xx
+===================
+
+Client library:
+- Fix threads linking on Windows for static libmosquitto library
+  Closes #3143
+
+Build:
+- Fix Windows builds not having websockets enabled.
+
+
 2.0.20 - 2024-10-16
 ===================
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -89,19 +89,19 @@ set_target_properties(libmosquitto PROPERTIES
 	POSITION_INDEPENDENT_CODE 1
 )
 
-target_link_libraries(libmosquitto PRIVATE ${LIBRARIES})
-
 if (WITH_THREADING)
 	if(WIN32)
-		 target_link_libraries(libmosquitto PRIVATE PThreads4W::PThreads4W)
+		set (LIBRARIES ${LIBRARIES} PThreads4W::PThreads4W)
 	else()
 		set(THREADS_PREFER_PTHREAD_FLAG ON)
 		find_package(Threads REQUIRED)
 
-		target_link_libraries(libmosquitto PRIVATE Threads::Threads)
+		set (LIBRARIES ${LIBRARIES} Threads::Threads)
 	endif()
 endif()
 
+target_link_libraries(libmosquitto PRIVATE ${LIBRARIES})
+
 set_target_properties(libmosquitto PROPERTIES
 	OUTPUT_NAME mosquitto
 	VERSION ${VERSION}