From 6c6cd7982045c5621ea962b50db2c8d28b7ff42f Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon, 13 Feb 2012 11:09:30 +0000
Subject: [PATCH] [1.5] Remove use of custom PTHREAD module. Prefer cmake's
 one.

---
 CMake/FindPTHREAD.cmake                      | 20 --------------------
 applications/jpip/CMakeLists.txt             |  5 ++++-
 applications/jpip/libopenjpip/CMakeLists.txt |  3 +--
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 CMake/FindPTHREAD.cmake

diff --git a/CMake/FindPTHREAD.cmake b/CMake/FindPTHREAD.cmake
deleted file mode 100644
index 0e717abe..00000000
--- a/CMake/FindPTHREAD.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# Look for the header file.
-FIND_PATH(PTHREAD_INCLUDE_DIR NAMES pthread.h)
-
-# Look for the library.
-FIND_LIBRARY(PTHREAD_LIBRARY NAMES pthread)
-
-# Handle the QUIETLY and REQUIRED arguments and set PTHREAD_FOUND to TRUE if all listed variables are TRUE.
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PTHREAD DEFAULT_MSG PTHREAD_LIBRARY PTHREAD_INCLUDE_DIR)
-
-# Copy the results to the output variables.
-IF(PTHREAD_FOUND)
-	SET(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY})
-	SET(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR})
-ELSE(PTHREAD_FOUND)
-	SET(PTHREAD_LIBRARIES)
-	SET(PTHREAD_INCLUDE_DIRS)
-ENDIF(PTHREAD_FOUND)
-
-MARK_AS_ADVANCED(PTHREAD_INCLUDE_DIRS PTHREAD_LIBRARIES)
diff --git a/applications/jpip/CMakeLists.txt b/applications/jpip/CMakeLists.txt
index 1485926c..70f8922f 100644
--- a/applications/jpip/CMakeLists.txt
+++ b/applications/jpip/CMakeLists.txt
@@ -2,7 +2,10 @@
 IF(BUILD_JPIP_SERVER)
   FIND_PACKAGE(CURL REQUIRED)
   FIND_PACKAGE(FCGI REQUIRED)
-  FIND_PACKAGE(PTHREAD REQUIRED)
+  FIND_PACKAGE(Threads REQUIRED)
+  IF(NOT CMAKE_USE_PTHREADS)
+    MESSAGE(FATAL_ERROR "Only pthread are supported")
+  ENDIF(NOT CMAKE_USE_PTHREADS)
 ENDIF(BUILD_JPIP_SERVER)
 
 # JPIP library:
diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt
index dfb75fd7..56ab057d 100644
--- a/applications/jpip/libopenjpip/CMakeLists.txt
+++ b/applications/jpip/libopenjpip/CMakeLists.txt
@@ -4,7 +4,6 @@ INCLUDE_DIRECTORIES(
   ${OPENJPEG_SOURCE_DIR}/libopenjpeg
   ${FCGI_INCLUDE_DIRS}
   ${CURL_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
 )
 
 # Defines the source code for the library
@@ -63,7 +62,7 @@ INSTALL(TARGETS openjpip_local
 
 IF(BUILD_JPIP_SERVER)
   ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS} ${SERVER_SRCS})
-  TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${PTHREAD_LIBRARIES})
+  TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS})
   SET_TARGET_PROPERTIES(openjpip_server
     PROPERTIES COMPILE_FLAGS "-DSERVER")
   INSTALL(TARGETS openjpip_server