X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1e5dedb10f6023f6061ad6e757794a673b585b0..72524c346ddad2bbb97217cf981a423676353b6b:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18f50cadfa..ba37530cf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,6 @@ ENDIF()
 
 if(WIN32)
 
-  #Need env INCLUDE
   set(CMAKE_INCLUDE_WIN "${CMAKE_C_COMPILER}")
   set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}")
   string(REGEX REPLACE "/bin/gcc.*" "/include"  CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
@@ -178,8 +177,6 @@ if(WIN32)
   set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
   unset(CMAKE_INCLUDE_WIN)
 
-  set(_XBT_WIN32 1)
-
 endif()
 
 include_directories(${INCLUDES})
@@ -280,13 +277,10 @@ else()
   set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
 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/ptrace.h" HAVE_SYS_PTRACE_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("ucontext.h" HAVE_UCONTEXT_H)
@@ -297,6 +291,8 @@ CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP)
 CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE)
 CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
 CHECK_FUNCTION_EXISTS(popen HAVE_POPEN)
+CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV)
+CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
 
 CHECK_SYMBOL_EXISTS(vasprintf stdio.h HAVE_VASPRINTF)
 if(MINGW) 
@@ -306,8 +302,6 @@ if(MINGW)
   set(HAVE_VASPRINTF 1)
 endif()
 
-CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV)
-CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
 
 #Check if __thread is defined
 execute_process(
@@ -514,23 +508,11 @@ endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE)
 endif()
-
-if(WIN32)
-  # We always provide our own implementation of ucontext on Windows.
-  try_compile(HAVE_UCONTEXT
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c
-    COMPILE_DEFINITIONS -D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/src/include -I${CMAKE_HOME_DIRECTORY}/src/xbt
-  )
-else()
-  # We always provide our own implementation of ucontext on Windows.
-  try_compile(HAVE_UCONTEXT
+try_compile(HAVE_UCONTEXT
     ${CMAKE_BINARY_DIR}
     ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_AC_CHECK_MCSC.c)
-endif()
 
 #If can have both context
-
 if(HAVE_UCONTEXT)
   set(HAVE_UCONTEXT_CONTEXTS 1)
   message("-- Support for ucontext factory")
@@ -597,46 +579,29 @@ if(GIT_DATE)
 endif()
 #--------------------------------------------------------------------------------------------------
 
-set(makecontext_CPPFLAGS_2 "")
 if(HAVE_UCONTEXT_H)
-  set(makecontext_CPPFLAGS "-DTEST_makecontext")
   if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    set(makecontext_CPPFLAGS_2 "-D_XOPEN_SOURCE=700")
-  endif()
-
-  if(WIN32)
-    if(ARCH_32_BITS)
-      set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
-    else()
-      set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
-    endif()
-    set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/src/include -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+    set(makecontext_CPPFLAGS "${makecontext_CPPFLAGS} -D_XOPEN_SOURCE=700")
   endif()
 
   file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
 
-  if(CMAKE_CROSSCOMPILING)
-    set(RUN_makecontext_VAR "cross")
-    set(COMPILE_makecontext_VAR "cross")
-  else()
+  if(NOT CMAKE_CROSSCOMPILING)
     try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stacksetup.c
-      COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
+      ${CMAKE_BINARY_DIR} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stacksetup.c
+      RUN_OUTPUT_VARIABLE stack_setup
+      COMPILE_DEFINITIONS "${makecontext_CPPFLAGS}"
       )
   endif()
 
-  if(EXISTS ${CMAKE_BINARY_DIR}/conftestval)
-    file(READ ${CMAKE_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
-    string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
-    string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
-    string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
-    string(REPLACE "," "" makecontext_addr "${MAKECONTEXT_ADDR}")
-    string(REPLACE "," "" makecontext_size "${MAKECONTEXT_SIZE}")
-    set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
-    set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
+  LIST(LENGTH stack_setup stack_setup_len)
+  if("${stack_setup_len}" STREQUAL "2")
+    LIST(GET stack_setup 0 makecontext_addr)
+    LIST(GET stack_setup 1 makecontext_size)
+    set(sg_makecontext_stack_addr "#define sg_makecontext_stack_addr(skaddr) (${makecontext_addr})")
+    set(sg_makecontext_stack_size "#define sg_makecontext_stack_size(sksize) (${makecontext_size})")
   else()
-    # message(FATAL_ERROR "makecontext is not compilable")
+    message(FATAL_ERROR "Could not figure out the stack setup. Compil: ${RUN_makecontext_VAR}. Exec: ${COMPILE_makecontext_VAR}. Output: ${stack_setup}")
   endif()
 endif()
 
@@ -667,31 +632,22 @@ endif()
 # If the test ran well, remove the test binary
 execute_process(COMMAND ${CMAKE_COMMAND} -E remove test_stackgrowth)
 
-###############
-## System checks
-##
-
 ### check for addr2line
-find_path(ADDR2LINE NAMES addr2line	PATHS NO_DEFAULT_PATHS	)
+find_path(ADDR2LINE NAMES addr2line	PATHS NO_DEFAULT_PATHS)
 if(ADDR2LINE)
   set(ADDR2LINE "${ADDR2LINE}/addr2line")
 endif()
 
-### File to create
+### Generate the required headers and scripts
+#############################################
+configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h"    @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in"          "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)
 
-configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in"
-  "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
+# We need two versions of the SMPI scripts because they contain the path to the library
+# so, it depends of whether SimGrid is installed, or run from the sources (during the build)
+file(READ ${CMAKE_HOME_DIRECTORY}/src/smpi/smpitools.sh SMPITOOLS_SH) # Definitions shared amongst all scripts, inlined in each of them
 
-SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_BINARY_DIR}/src/internal_config.h" "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)
-
-set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
-set(srcdir "${CMAKE_HOME_DIRECTORY}/src")
-set(bindir "${CMAKE_BINARY_DIR}")
-
-### Script used when simgrid is installed
+### SMPI script used when simgrid is installed
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})
 set(includeflag "-I${CMAKE_INSTALL_PREFIX}/include -I${CMAKE_INSTALL_PREFIX}/include/smpi")
 set(includedir "${CMAKE_INSTALL_PREFIX}/include")
@@ -702,45 +658,32 @@ if(NS3_LIBRARY_PATH)
 endif()
 set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
 
-file(READ ${CMAKE_HOME_DIRECTORY}/src/smpi/smpitools.sh SMPITOOLS_SH)
 configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/mpif.h @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicxx.in ${CMAKE_BINARY_DIR}/bin/smpicxx @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_BINARY_DIR}/bin/smpiff @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif90.in ${CMAKE_BINARY_DIR}/bin/smpif90 @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_BINARY_DIR}/bin/smpirun @ONLY)
+foreach(script cc cxx ff f90 run)
+  configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpi${script}.in ${CMAKE_BINARY_DIR}/bin/smpi${script} @ONLY)
+endforeach()
 
-### Script used when simgrid is compiling
+### SMPI scripts used when compiling simgrid 
+set(exec_prefix "${CMAKE_BINARY_DIR}/smpi_script/")
 set(includeflag "-I${CMAKE_HOME_DIRECTORY}/include -I${CMAKE_HOME_DIRECTORY}/include/smpi")
 set(includeflag "${includeflag} -I${CMAKE_BINARY_DIR}/include -I${CMAKE_BINARY_DIR}/include/smpi")
 set(includedir "${CMAKE_HOME_DIRECTORY}/include")
-set(exec_prefix "${CMAKE_BINARY_DIR}/smpi_script/")
+set(libdir "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${CMAKE_BINARY_DIR}/lib")
 if(NS3_LIBRARY_PATH)
   set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}")
 endif()
 set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}\"")
-set(libdir "${CMAKE_BINARY_DIR}/lib")
-
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicxx.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpicxx @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpiff.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif90.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90 @ONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpirun.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun @ONLY)
 
-set(top_builddir ${CMAKE_HOME_DIRECTORY})
+foreach(script cc cxx ff f90 run)
+  configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpi${script}.in ${CMAKE_BINARY_DIR}/smpi_script/bin/smpi${script} @ONLY)
+endforeach()
 
 if(NOT WIN32)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicxx)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif90)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/smpi_script/bin/smpicxx)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90)
-  execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun)
+  foreach(script cc cxx ff f90 run)
+    execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpi${script})
+    execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/smpi_script/bin/smpi${script})
+  endforeach()
 endif()
 
 set(generated_headers_to_install
@@ -749,7 +692,6 @@ set(generated_headers_to_install
   )
 
 set(generated_headers
-  ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h
   ${CMAKE_CURRENT_BINARY_DIR}/src/internal_config.h
   )
 
@@ -933,54 +875,22 @@ endif()
 
 ### Print the result of configuration
 message("")
-message("______________________________________________________________________")
-message("______________________________________________________________________ DEBUG")
-message("CMAKE_HOME_DIRECTORY ........: ${CMAKE_HOME_DIRECTORY}")
-message("")
-message("PTH_STACKGROWTH .............: ${PTH_STACKGROWTH}")
-message("HAVE_VA_COPY ................: ${HAVE_VA_COPY}")
-message("")
-message("\#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
-message("\#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
-message("\#define __VA_COPY_USE          ${__VA_COPY_USE}")
-message("HAVE_UCONTEXT ...............: ${HAVE_UCONTEXT}")
-message("")
-message("HAVE_PTHREAD ................: ${HAVE_PTHREAD}")
-message("HAVE_SEM_INIT ...............: ${HAVE_SEM_INIT_LIB}")
-message("HAVE_POSIX_GETTIME ..........: ${HAVE_POSIX_GETTIME}")
-message("")
-message("STDC_HEADERS ................: ${STDC_HEADERS}")
-message("HAVE_VALGRIND_VALGRIND_H ....: ${HAVE_VALGRIND_VALGRIND_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_DLFCN_H ................: ${HAVE_DLFCN_H}")
-
-message("")
-message("HAVE_GETTIMEOFDAY ...........: ${HAVE_GETTIMEOFDAY}")
-message("HAVE_NANOSLEEP ..............: ${HAVE_NANOSLEEP}")
-message("HAVE_GETDTABLESIZE ..........: ${HAVE_GETDTABLESIZE}")
-message("HAVE_SYSCONF ................: ${HAVE_SYSCONF}")
-message("HAVE_POPEN ..................: ${HAVE_POPEN}")
-message("HAVE_VASPRINTF ..............: ${HAVE_VASPRINTF}")
-message("HAVE_MMAP ...................: ${HAVE_MMAP}")
-message("HAVE_PRIVATIZATION ..........: ${HAVE_PRIVATIZATION}")
-message("HAVE_PROCESS_VM_READV .......: ${HAVE_PROCESS_VM_READV}")
-message("HAVE_THREAD_LOCAL_STORAGE ...: ${HAVE_THREAD_LOCAL_STORAGE}")
-message("HAVE_MMALLOC ................: ${HAVE_MMALLOC}")
-message("")
-message("HAVE_THREAD_CONTEXTS .............: ${HAVE_THREAD_CONTEXTS}")
-message("HAVE_UCONTEXT_CONTEXTS ............: ${HAVE_UCONTEXT_CONTEXTS}")
-message("______________________________________________________________________")
-message("______________________________________________________________________ DEBUG END")
-message("")
-
+message("##########################################")
+message("#### Content of src/internal_config.h ####")
+file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/src/internal_config.h config_output)
+LIST(REMOVE_AT config_output 0 1 2 3 4 5 6 7 8) # Pass the file header
+foreach(line ${config_output})
+  message("   ${line}")
+endforeach()
+message("####   end of src/internal_config.h   ####")
+message("##########################################")
 
 message("\nConfiguration of package `simgrid':")
+message("        Home directory ..............: ${CMAKE_HOME_DIRECTORY}")
 message("        Build Name ..................: ${BUILDNAME}")
 message("        Cmake Generator .............: ${CMAKE_GENERATOR}")
-message("        SITE ........................: ${SITE}")
+message("        Site ........................: ${SITE}")
+message("        Install prefix ..............: ${CMAKE_INSTALL_PREFIX}")
 if(release)
   message("        Release .....................: simgrid-${release_version}${SIMGRID_VERSION_EXTRA} (release build)")
 else()
@@ -1029,23 +939,21 @@ else()
 endif()
 message("        Compile Lua .................: ${HAVE_LUA}")
 message("        Compile Smpi ................: ${HAVE_SMPI}")
-message("        Compile MPI testsuite .......: ${enable_smpi_MPICH3_testsuite}")
-message("        Compile Smpi f77 ............: ${SMPI_FORTRAN}")
-message("        Compile Smpi f90 ............: ${SMPI_FORTRAN}")
+message("          Smpi fortran ..............: ${SMPI_FORTRAN}")
+message("          MPICH3 testsuite ..........: ${enable_smpi_MPICH3_testsuite}")
+message("          Privatization .............: ${HAVE_PRIVATIZATION}")
 message("        Compile Boost.Context support: ${HAVE_BOOST_CONTEXTS}")
 message("")
 message("        Maintainer mode .............: ${enable_maintainer_mode}")
 message("        Documentation................: ${enable_documentation}")
 message("        Model checking ..............: ${HAVE_MC}")
-message("        Tracing mode ................: ${enable_tracing}")
-message("        Jedule  mode ................: ${enable_jedule}")
+message("        Jedule  mode ................: ${HAVE_JEDULE}")
 message("        Graphviz mode ...............: ${HAVE_GRAPHVIZ}")
 message("        Sigc++ mode .................: ${SIMGRID_HAVE_LIBSIG}")
 message("        Mallocators .................: ${enable_mallocators}")
 message("")
 message("        Simgrid dependencies ........: ${SIMGRID_DEP}")
 message("")
-message("        INSTALL_PREFIX ..............: ${CMAKE_INSTALL_PREFIX}")
 
 exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
 file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build  "GIT version : ${GIT_VERSION}\n")