From 307dd033f0a803265a04db51a003a71c4be383dc Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Tue, 6 Dec 2016 19:20:34 +0000 Subject: [CMake] Rewrite pthreads checks for compatibility with configure. Main point: pthreads must not be checked under Windows (e.g. MinGW) since Windows always uses native Windows threads (unless Cygwin is used). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12138 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CMake/resources.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'CMake/resources.cmake') diff --git a/CMake/resources.cmake b/CMake/resources.cmake index 37c0c08ef..4f380ecd5 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake @@ -30,7 +30,6 @@ find_file(HAVE_LIBPNG_PNG_H libpng/png.h) find_file(HAVE_LOCALE_H locale.h) find_file(HAVE_OPENGL_GLU_H OpenGL/glu.h) find_file(HAVE_PNG_H png.h) -find_file(HAVE_PTHREAD_H pthread.h) find_file(HAVE_STDIO_H stdio.h) find_file(HAVE_STRINGS_H strings.h) find_file(HAVE_SYS_SELECT_H sys/select.h) @@ -38,6 +37,13 @@ find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h) find_file(HAVE_X11_XREGION_H X11/Xregion.h) find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions) +if (WIN32 AND NOT CYGWIN) + # we don't use pthreads on Windows (except for Cygwin, see options.cmake) + set(HAVE_PTHREAD_H 0) +else () + find_file(HAVE_PTHREAD_H pthread.h) +endif (WIN32 AND NOT CYGWIN) + if (MSVC) message(STATUS "Note: The following three headers should all be found!") message(STATUS "HAVE_GL_GL_H = '${HAVE_GL_GL_H}'") -- cgit v1.2.3