From 916f2d2dbf846000d66711f1a0f241eff73eaaeb Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Fri, 15 Nov 2013 16:04:04 +0100 Subject: [PATCH] winpr: fixed build warnings * moved pthread_tryjoin_np to toplevel CMakeLists.txt * removed duplicated -DHAVE_PTHREAD_GNU_EXT --- CMakeLists.txt | 5 +++++ winpr/libwinpr/synch/CMakeLists.txt | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a11ecb4..1638f0f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,6 +312,11 @@ if(NOT IOS AND NOT ANDROID) find_package(Threads REQUIRED) endif() +list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) +check_library_exists(pthread pthread_tryjoin_np "" HAVE_PTHREAD_GNU_EXT) +list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) + + if(UNIX OR CYGWIN) check_include_files(sys/eventfd.h HAVE_AIO_H) check_include_files(sys/eventfd.h HAVE_EVENTFD_H) diff --git a/winpr/libwinpr/synch/CMakeLists.txt b/winpr/libwinpr/synch/CMakeLists.txt index e0ab228..7104df8 100644 --- a/winpr/libwinpr/synch/CMakeLists.txt +++ b/winpr/libwinpr/synch/CMakeLists.txt @@ -18,13 +18,8 @@ set(MODULE_NAME "winpr-synch") set(MODULE_PREFIX "WINPR_SYNCH") -INCLUDE (CheckLibraryExists) -list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) -check_library_exists(pthread pthread_tryjoin_np "" HAVE_PTHREAD_GNU_EXT) -list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) - if(HAVE_PTHREAD_GNU_EXT) - add_definitions(-D_GNU_SOURCE -DHAVE_PTHREAD_GNU_EXT) + add_definitions(-D_GNU_SOURCE) endif(HAVE_PTHREAD_GNU_EXT) include_directories(../thread) -- 2.7.4