[cmake] simplify the detection of the ucontext stack setup

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03a797d..fa02918 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,7 +278,6 @@ else()
 endif()
 
 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)
@@ -580,23 +579,18 @@ 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")
+    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}"
+      COMPILE_DEFINITIONS "${makecontext_CPPFLAGS}"
       )
   endif()
 
@@ -651,9 +645,6 @@ endif()
 
 ### File to create
 
-configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in"
-  "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
-
 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)
@@ -721,7 +712,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
   )
 
@@ -905,50 +895,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("")
-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("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("")
-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()
@@ -997,23 +959,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")