Change yes value to 1 value.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7405 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index c86b245..d971ebd 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -17,7 +17,6 @@ CHECK_LIBRARY_EXISTS(rt       clock_gettime           NO_DEFAULT_PATHS HAVE_POSIX_GETTIME)
 CHECK_INCLUDE_FILES("time.h;sys/time.h" TIME_WITH_SYS_TIME)
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H)
-CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
 CHECK_INCLUDE_FILE(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H)
 CHECK_INCLUDE_FILE(socket.h HAVE_SOCKET_H)
 CHECK_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H)
@@ -128,12 +127,12 @@ endif(disable_gtnets)
 ### Initialize of CONTEXT THREADS
 
 if(pthread)
-set(pthread "yes")
+set(pthread 1)
 elseif(pthread)
-set(pthread "no")
+set(pthread 0)
 endif(pthread)
 
-if(pthread MATCHES "yes")
+if(pthread)
        ### HAVE_SEM_INIT
        
        if(HAVE_SEM_INIT_LIB)
@@ -166,7 +165,7 @@ if(pthread MATCHES "yes")
                        set(HAVE_MUTEX_TIMEDLOCK 1)
                endif(HAVE_MUTEX_TIMEDLOCK_run)
        endif(HAVE_MUTEX_TIMEDLOCK_LIB)
-endif(pthread MATCHES "yes")
+endif(pthread)
 
 # AC_CHECK_MCSC(mcsc=yes, mcsc=no) 
 set(mcsc_flags "")
@@ -186,14 +185,14 @@ elseif(mcsc MATCHES "yes")
        set(mcsc "no")
 endif(mcsc MATCHES "yes")
 
-if(mcsc MATCHES "no" AND pthread MATCHES "no")
+if(mcsc MATCHES "no" AND pthread)
        if(HAVE_WINDOWS_H)
                set(windows_context "yes")
                set(IS_WINDOWS 1)
        elseif(HAVE_WINDOWS_H)
                message(FATAL_ERROR "no appropriate backend found")
        endif(HAVE_WINDOWS_H)
-endif(mcsc MATCHES "no" AND pthread MATCHES "no")
+endif(mcsc MATCHES "no" AND pthread)
 
 if(with_context MATCHES "ucontext" AND mcsc MATCHES "no")
        message(FATAL_ERROR "-Dwith-context=ucontext specified but ucontext unusable.")
@@ -235,9 +234,9 @@ endif(with_context MATCHES "ucontext")
 
 if(with_context MATCHES "pthread")
        set(with_context_ok 1)
-       if(pthread MATCHES "no")
+       if(NOT pthread)
                message(FATAL_ERROR "Cannot find pthreads (try -Dwith_context=ucontext if you haven't already tried).")
-       endif(pthread MATCHES "no")
+       endif(NOT pthread)
        SET(CONTEXT_THREADS 1)
 endif(with_context MATCHES "pthread")
 

diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index b1e7266..8cff510 100644 (file)
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -30,13 +30,12 @@ if(print_message)
        message("TIME_WITH_SYS_TIME             ${TIME_WITH_SYS_TIME}")
        message("STDC_HEADERS                   ${STDC_HEADERS}")
        message("HAVE_PTHREAD_H                 ${HAVE_PTHREAD_H}")
-       message("HAVE_WINDOWS_H                 ${HAVE_WINDOWS_H}")
        message("HAVE_VALGRIND_VALGRIND_H       ${HAVE_VALGRIND_VALGRIND_H}")
        message("HAVE_SOCKET_H                  ${HAVE_SOCKET_H}")
        message("HAVE_SYS_SOCKET_H              ${HAVE_SYS_SOCKET_H}")
        message("HAVE_STAT_H                    ${HAVE_STAT_H}")
        message("HAVE_SYS_STAT_H                ${HAVE_SYS_STAT_H}")
-       message("HAVE_WINDOWS_H                 ${HAVE_WINDOWS_H}")
+       message("HAVE_WINDOWS_H                 ${HAVE_WINDOWS_H}")
        message("HAVE_WINSOCK_H                 ${HAVE_WINSOCK_H}")
        message("HAVE_WINSOCK2_H                ${HAVE_WINSOCK2_H}")
        message("HAVE_ERRNO_H                   ${HAVE_ERRNO_H}")
@@ -46,7 +45,7 @@ if(print_message)
        message("HAVE_SYS_TIME_H                ${HAVE_SYS_TIME_H}")
        message("HAVE_TIME_H                    ${HAVE_TIME_H}")
        message("HAVE_DLFCN_H                   ${HAVE_DLFCN_H}")
-       message("HAVE_INTTYPES_H                ${HAVE_INTTYPES_H}")
+       message("HAVE_INTTYPES_H                        ${HAVE_INTTYPES_H}")
        message("HAVE_MEMORY_H                  ${HAVE_MEMORY_H}")
        message("HAVE_STDLIB_H                  ${HAVE_STDLIB_H}")
        message("HAVE_STRINGS_H                 ${HAVE_STRINGS_H}")