diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-02-13 11:09:30 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-02-13 11:09:30 +0000 |
| commit | 6c6cd7982045c5621ea962b50db2c8d28b7ff42f (patch) | |
| tree | 6832f795ed0e633e846fb290c2832f530ada8c36 /applications | |
| parent | 7b6ae8810de9128ab84c52e286af391e81cfd5ea (diff) | |
[1.5] Remove use of custom PTHREAD module. Prefer cmake's one.
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/jpip/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | applications/jpip/libopenjpip/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 3 deletions
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 |