Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb76757..dfd7569 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,16 +180,6 @@ if(WIN32)
 
   set(_XBT_WIN32 1)
 
-  message(STATUS "C_COMPILER                    ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_VERSION}")
-  message(STATUS "CXX_COMPILER                  ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_VERSION}")
-  message(STATUS "CMAKE_RC_COMPILER             ${CMAKE_RC_COMPILER}")
-  message(STATUS "LIB                           ${CMAKE_LIB_WIN}")
-  message(STATUS "MAKE_PROGRAM                  ${CMAKE_MAKE_PROGRAM}")
-  message(STATUS "CMAKE_BUILD_TOOL              ${CMAKE_BUILD_TOOL}")
-  message(STATUS "LINKER                        ${CMAKE_LINKER}")
-  message(STATUS "CMAKE_GENERATOR               ${CMAKE_GENERATOR}")
-  message(STATUS "GNUC                          ${CMAKE_COMPILER_IS_GNUCC}")
-
 endif()
 
 include_directories(${INCLUDES})
@@ -280,12 +270,12 @@ 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)
 CHECK_LIBRARY_EXISTS(pthread pthread_mutex_timedlock "" HAVE_MUTEX_TIMEDLOCK_LIB)
-
+CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np  "" HAVE_PTHREAD_SETAFFINITY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_REQUIRED_DEFINITIONS "-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 elseif(MINGW)
-  # Use the GNU version of unusual modifiers like PRIx64
+  # Use the GNU version of unusual modifiers like PRIx64
   add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
   set(CMAKE_REQUIRED_DEFINITIONS "-D__USE_MINGW_ANSI_STDIO=1")
 else()
@@ -294,17 +284,13 @@ endif()
 
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
 CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H)
-CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/ptrace.h" HAVE_SYS_PTRACE_H)
-CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
-CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
 CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE("execinfo.h" HAVE_EXECINFO_H)
 CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
-CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H)
 CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
 CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H)
 
@@ -322,9 +308,7 @@ if(MINGW)
   set(HAVE_VASPRINTF 1)
 endif()
 
-CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
 CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV)
-
 CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
 
 #Check if __thread is defined
@@ -653,7 +637,7 @@ endif()
 #--------------------------------------------------------------------------------------------------
 
 set(makecontext_CPPFLAGS_2 "")
-if(HAVE_MAKECONTEXT OR WIN32)
+if(HAVE_UCONTEXT_H)
   set(makecontext_CPPFLAGS "-DTEST_makecontext")
   if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
     set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE=700")
@@ -1008,14 +992,10 @@ message("HAVE_POSIX_GETTIME ..........: ${HAVE_POSIX_GETTIME}")
 message("")
 message("STDC_HEADERS ................: ${STDC_HEADERS}")
 message("HAVE_VALGRIND_VALGRIND_H ....: ${HAVE_VALGRIND_VALGRIND_H}")
-message("HAVE_SYS_STAT_H .............: ${HAVE_SYS_STAT_H}")
-message("HAVE_WINDOWS_H ..............: ${HAVE_WINDOWS_H}")
-message("HAVE_ERRNO_H ................: ${HAVE_ERRNO_H}")
 message("HAVE_UNISTD_H ...............: ${HAVE_UNISTD_H}")
 message("HAVE_EXECINFO_H .............: ${HAVE_EXECINFO_H}")
 message("HAVE_SIGNAL_H ...............: ${HAVE_SIGNAL_H}")
 message("HAVE_SYS_TIME_H .............: ${HAVE_SYS_TIME_H}")
-message("HAVE_TIME_H .................: ${HAVE_TIME_H}")
 message("HAVE_DLFCN_H ................: ${HAVE_DLFCN_H}")
 
 message("")
@@ -1024,7 +1004,6 @@ message("HAVE_NANOSLEEP ..............: ${HAVE_NANOSLEEP}")
 message("HAVE_GETDTABLESIZE ..........: ${HAVE_GETDTABLESIZE}")
 message("HAVE_SYSCONF ................: ${HAVE_SYSCONF}")
 message("HAVE_POPEN ..................: ${HAVE_POPEN}")
-message("HAVE_MAKECONTEXT ............: ${HAVE_MAKECONTEXT}")
 message("HAVE_VASPRINTF ..............: ${HAVE_VASPRINTF}")
 message("HAVE_MMAP ...................: ${HAVE_MMAP}")
 message("HAVE_PRIVATIZATION ..........: ${HAVE_PRIVATIZATION}")
@@ -1038,8 +1017,10 @@ message("______________________________________________________________________"
 message("______________________________________________________________________ DEBUG END")
 message("")
 
+
 message("\nConfiguration of package `simgrid':")
-message("        BUILDNAME ...................: ${BUILDNAME}")
+message("        Build Name ..................: ${BUILDNAME}")
+message("        Cmake Generator .............: ${CMAKE_GENERATOR}")
 message("        SITE ........................: ${SITE}")
 if(release)
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (release build)")
@@ -1047,12 +1028,11 @@ else()
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (development build)")
 endif()
 message("")
-message("        Compiler: C .................: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})")
+message("        Compiler: C .................: ${CMAKE_C_COMPILER} (id: ${CMAKE_C_COMPILER_ID})")
 message("                version .............: ${CMAKE_C_COMPILER_VERSION}")
-if(CMAKE_CXX_COMPILER)
-  message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})")
-  message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")
-endif()
+message("                is gnu ..............: ${CMAKE_COMPILER_IS_GNUCC}")
+message("        Compiler: C++ ...............: ${CMAKE_CXX_COMPILER} (id: ${CMAKE_CXX_COMPILER_ID})")
+message("                version .............: ${CMAKE_CXX_COMPILER_VERSION}")
 if(${Java_FOUND})
   message("        Compiler: Javac .............: ${Java_JAVAC_EXECUTABLE}")
   message("                version .............: ${Java_VERSION_STRING}")
@@ -1063,11 +1043,12 @@ else()
 endif()
 endif()
 if(CMAKE_Fortran_COMPILER)
-  message("        Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (${CMAKE_Fortran_COMPILER_ID})")
+  message("        Compiler: Fortran ...........: ${CMAKE_Fortran_COMPILER} (id: ${CMAKE_Fortran_COMPILER_ID})")
   message("                version .............: ${CMAKE_Fortran_COMPILER_VERSION}")
 endif()
 message("        Linker: .....................: ${CMAKE_LINKER}")
 message("                version .............: ${LINKER_VERSION}")
+message("        Make program: ...............: ${CMAKE_MAKE_PROGRAM}")
 message("")
 message("        CFlags ......................: ${CMAKE_C_FLAGS}")
 message("        CXXFlags ....................: ${CMAKE_CXX_FLAGS}")
@@ -1087,7 +1068,6 @@ if (${Java_FOUND})
 else()
   message("        Compile Java ................: NO")
 endif()
-message("        Compile Scala................: ${HAVE_Scala}")
 message("        Compile Lua .................: ${HAVE_LUA}")
 message("        Compile Smpi ................: ${HAVE_SMPI}")
 message("        Compile MPI testsuite .......: ${enable_smpi_MPICH3_testsuite}")