diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2775a3da..f9c94fec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,12 +67,18 @@ option(WITH_THREADING "Include client library threading support?" ON)
 if (WITH_THREADING)
 	add_definitions("-DWITH_THREADING")
 	if (WIN32)
-		if (CMAKE_CL_64)
-			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
-		else (CMAKE_CL_64)
-			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
-		endif (CMAKE_CL_64)
-		set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
+		if (CMAKE_VERSION VERSION_LESS "3.1")
+			if (CMAKE_CL_64)
+				set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
+			else (CMAKE_CL_64)
+				set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
+			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)
 		set (PTHREAD_LIBRARIES "")
 		set (PTHREAD_INCLUDE_DIR "")