properly disable pthreads on windows (+cleanups)

diff --git a/src/xbt/xbt_sg_stubs.c b/src/xbt/xbt_sg_stubs.c
index 149fb39..c8d83be 100644 (file)
--- a/src/xbt/xbt_sg_stubs.c
+++ b/src/xbt/xbt_sg_stubs.c
@@ -22,7 +22,7 @@
 
 #ifndef CONTEXT_THREADS
 #ifndef WIN32
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
 /* xbt_threads is loaded in libsimgrid when they are used to implement the xbt_context.
  * The decision (and the loading) is made in xbt/context.c.
  */

diff --git a/tools/cmake/CompleteInFiles.cmake b/tools/cmake/CompleteInFiles.cmake
index ed50629..0a5cc35 100644 (file)
--- a/tools/cmake/CompleteInFiles.cmake
+++ b/tools/cmake/CompleteInFiles.cmake
@@ -142,7 +142,9 @@ endif()
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(dl      dlopen                  "" HAVE_DLOPEN_IN_LIBDL)
 CHECK_LIBRARY_EXISTS(execinfo backtrace              "" HAVE_BACKTRACE_IN_LIBEXECINFO)
-CHECK_LIBRARY_EXISTS(pthread pthread_create          "" HAVE_PTHREAD)
+if(NOT WIN32)
+  CHECK_LIBRARY_EXISTS(pthread pthread_create          "" HAVE_PTHREAD)
+endif()
 CHECK_LIBRARY_EXISTS(pthread sem_init                "" HAVE_SEM_INIT_LIB)
 CHECK_LIBRARY_EXISTS(pthread sem_open                "" HAVE_SEM_OPEN_LIB)
 CHECK_LIBRARY_EXISTS(pthread sem_timedwait           "" HAVE_SEM_TIMEDWAIT_LIB)
@@ -159,9 +161,6 @@ else()
 endif()
 
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
-if(NOT WIN32)
-  CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
-endif()
 CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H)
 CHECK_INCLUDE_FILE("socket.h" HAVE_SOCKET_H)
 CHECK_INCLUDE_FILE("stat.h" HAVE_STAT_H)

diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake
index 2f9906e..e7ad433 100644 (file)
--- a/tools/cmake/PrintArgs.cmake
+++ b/tools/cmake/PrintArgs.cmake
@@ -16,14 +16,13 @@ if(enable_print_message)
   message("\#define __VA_COPY_USE          ${__VA_COPY_USE}")
   message("HAVE_UCONTEXT ...............: ${HAVE_UCONTEXT}")
   message("")
-  message("HAVE_PTHREAD_CREATE .........: ${pthread}")
+  message("HAVE_PTHREAD ................: ${HAVE_PTHREAD}")
   message("HAVE_SEM_INIT ...............: ${HAVE_SEM_INIT_LIB}")
   message("HAVE_SEM_TIMEDWAIT ..........: ${HAVE_SEM_TIMEDWAIT_LIB}")
   message("HAVE_MUTEX_TIMEDLOCK ........: ${HAVE_MUTEX_TIMEDLOCK_LIB}")
   message("HAVE_POSIX_GETTIME ..........: ${HAVE_POSIX_GETTIME}")
   message("")
   message("STDC_HEADERS ................: ${STDC_HEADERS}")
-  message("HAVE_PTHREAD_H ..............: ${HAVE_PTHREAD_H}")
   message("HAVE_VALGRIND_VALGRIND_H ....: ${HAVE_VALGRIND_VALGRIND_H}")
   message("HAVE_SOCKET_H ...............: ${HAVE_SOCKET_H}")
   message("HAVE_STAT_H .................: ${HAVE_STAT_H}")

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index da87ea0..96a9cda 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -168,8 +168,8 @@
 /* Define to 1 if you have the `popen' function. */
 #cmakedefine HAVE_POPEN @HAVE_POPEN@
 
-/* Define to 1 if you have the <pthread.h> header file. */
-#cmakedefine HAVE_PTHREAD_H @HAVE_PTHREAD_H@
+/* Define to 1 if threads are usable . */
+#cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@
 
 /* Define to 1 if you have the `readv' function. */
 #cmakedefine HAVE_READV @HAVE_READV@