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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62c423ee73..166dfae0b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,9 +79,9 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi)
   endif()
   
   if(CMAKE_Fortran_COMPILER)
+
     # Fortran compiler detected: save it, then replace by smpiff
     set(SMPI_Fortran_COMPILER "${CMAKE_Fortran_COMPILER}" CACHE FILEPATH "The real Fortran compiler")
-    set(CMAKE_Fortran_COMPILER smpiff)
 
 	# Set flags/libs to be used in smpiff
     if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
@@ -105,7 +105,7 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "18")
+set(SIMGRID_VERSION_MINOR "19")
 set(SIMGRID_VERSION_PATCH "90")
 set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
@@ -292,10 +292,6 @@ endif()
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
 
-if(NOT APPLE) # OS X El Capitan deprecates this function
-  CHECK_LIBRARY_EXISTS(pthread sem_init                "" HAVE_SEM_INIT_LIB)
-endif()
-CHECK_LIBRARY_EXISTS(pthread sem_open                "" HAVE_SEM_OPEN_LIB)
 set(HAVE_PTHREAD_SETAFFINITY 0)
 CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np  "" HAVE_PTHREAD_SETAFFINITY)
 
@@ -428,38 +424,6 @@ else()
   SET(HAVE_SMPI 0)
 endif()
 
-#--------------------------------------------------------------------------------------------------
-### Check for GNU dynamic linker
-CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
-if (HAVE_DLFCN_H)
-  execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_gnu_dynlinker.c ${DL_LIBRARY} -o test_gnu_ld
-                  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                  OUTPUT_VARIABLE HAVE_GNU_LD_compil
-  )
-  if(HAVE_GNU_LD_compil)
-    set(HAVE_GNU_LD 0)
-    message(STATUS "Warning: test program toward GNU ld failed to compile:")
-    message(STATUS "${HAVE_GNU_LD_comp_output}")
-  else()
-    execute_process(COMMAND ./test_gnu_ld
-                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                    RESULT_VARIABLE HAVE_GNU_LD_run
-                    OUTPUT_VARIABLE var_exec
-                   )
-
-    if(NOT HAVE_GNU_LD_run)
-      set(HAVE_GNU_LD 1)
-      message(STATUS "We are using GNU dynamic linker")
-    else()
-      set(HAVE_GNU_LD 0)
-      message(STATUS "Warning: error while checking for GNU ld:")
-      message(STATUS "Test output: '${var_exec}'")
-      message(STATUS "Exit status: ${HAVE_GNU_LD_run}")
-    endif()
-    file(REMOVE test_gnu_ld)
-  endif()
-endif()
-
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 
@@ -467,94 +431,70 @@ set(HAVE_THREAD_CONTEXTS 0)
 if(CMAKE_USE_PTHREADS_INIT)
   ### Test that we have a way to create semaphores
 
+  set(HAVE_SEM_OPEN 0)
+  CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB)
   if(HAVE_SEM_OPEN_LIB)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_open.c -lpthread -o sem_open
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      OUTPUT_VARIABLE HAVE_SEM_OPEN_compil
-    )
-
-    # Test sem_open by compiling:
-    if(HAVE_SEM_OPEN_compil)
-      set(HAVE_SEM_OPEN 0)
-      message(STATUS "Warning: sem_open not compilable")
-      message(STATUS "HAVE_SEM_OPEN_comp_output: ${HAVE_SEM_OPEN_comp_output}")
-    else()
-      set(HAVE_SEM_OPEN 1)
-      message(STATUS "sem_open is compilable")
-    endif()
-
-    # If we're not crosscompiling, we check by executing the program:
-    if (HAVE_SEM_OPEN AND NOT CMAKE_CROSSCOMPILING)
-      execute_process(COMMAND ./sem_open
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        RESULT_VARIABLE HAVE_SEM_OPEN_run
-        OUTPUT_VARIABLE var_compil
-      )
-      if (NOT HAVE_SEM_OPEN_run)
-        set(HAVE_SEM_OPEN 1)
-        message(STATUS "sem_open is executable")
+    try_run(semopen_retval semopen_compilable
+            ${CMAKE_BINARY_DIR}
+            ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_open.c
+	    LINK_LIBRARIES pthread
+	    COMPILE_OUTPUT_VARIABLE semopen_compilmsg
+            RUN_OUTPUT_VARIABLE semopen_runmsg)
+    
+    if(semopen_compilable)
+      if(NOT semopen_retval) # error if not 0
+        message(STATUS "sem_open is compilable and executable")
+	set(HAVE_SEM_OPEN 1)
       else()
-        set(HAVE_SEM_OPEN 0)
-        if(EXISTS "${CMAKE_BINARY_DIR}/sem_open")
-          message(STATUS "Bin ${CMAKE_BINARY_DIR}/sem_open exists!")
-        else()
-          message(STATUS "Bin ${CMAKE_BINARY_DIR}/sem_open not exists!")
-        endif()
-        message(STATUS "Warning: sem_open not executable")
-        message(STATUS "Compilation output: '${var_compil}'")
-        message(STATUS "Exit result of sem_open: ${HAVE_SEM_OPEN_run}")
+        message(STATUS "Warning: sem_open seems compilable but not executable")
+        message(STATUS "Compilation output: ${semopen_compilmsg}")
+        message(STATUS "Execution output: ${semopen_runmsg}")
+        message(STATUS "Exit value: ${semopen_retval}")
       endif()
+    else()
+      message(STATUS "Warning: sem_open not compilable")
+      message(STATUS "Compilation output: ${semopen_compilmsg}")
     endif()
-    file(REMOVE sem_open)
-  else()
-    set(HAVE_SEM_OPEN 0)
+    unset(semopen_compilable)
+    unset(semopen_retval)
+    unset(semopen_runmsg)
+    unset(semopen_compilmsg)
   endif()
 
+  set(HAVE_SEM_INIT 0)  
+  if(NOT APPLE) # OS X El Capitan deprecates this function
+    CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB)
+  endif()
   if(HAVE_SEM_INIT_LIB)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_init.c -lpthread -o sem_init
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      RESULT_VARIABLE HAVE_SEM_INIT_run 
-      OUTPUT_VARIABLE HAVE_SEM_INIT_compil)
-
-    # Test sem_init by compiling:
-    if(HAVE_SEM_INIT_compil)
-      set(HAVE_SEM_INIT 0)
-      message(STATUS "Warning: sem_init not compilable")
-      message(STATUS "HAVE_SEM_INIT_comp_output: ${HAVE_SEM_OPEN_comp_output}")
-    else()
-      set(HAVE_SEM_INIT 1)
-      message(STATUS "sem_init is compilable")
-    endif()
-
-    # If we're not crosscompiling, we check by executing the program:
-    if (HAVE_SEM_INIT AND NOT CMAKE_CROSSCOMPILING)
-      execute_process(COMMAND ./sem_init
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        RESULT_VARIABLE HAVE_SEM_INIT_run
-        OUTPUT_VARIABLE var_compil
-      )
-      if (NOT HAVE_SEM_INIT_run)
-        set(HAVE_SEM_INIT 1)
-        message(STATUS "sem_init is executable")
+    try_run(seminit_retval seminit_compilable
+            ${CMAKE_BINARY_DIR}
+            ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_sem_init.c
+	    LINK_LIBRARIES pthread
+	    COMPILE_OUTPUT_VARIABLE seminit_compilmsg
+            RUN_OUTPUT_VARIABLE seminit_runmsg)
+    
+    if(seminit_compilable)
+      if(NOT seminit_retval) # error if not 0
+        message(STATUS "sem_init is compilable and executable")
+	set(HAVE_SEM_INIT 1)
       else()
-        set(HAVE_SEM_INIT 0)
-        if(EXISTS "${CMAKE_BINARY_DIR}/sem_init")
-          message(STATUS "Bin ${CMAKE_BINARY_DIR}/sem_init exists!")
-        else()
-          message(STATUS "Bin ${CMAKE_BINARY_DIR}/sem_init not exists!")
-        endif()
-        message(STATUS "Warning: sem_init not executable")
-        message(STATUS "Compilation output: '${var_compil}'")
-        message(STATUS "Exit result of sem_init: ${HAVE_SEM_INIT_run}")
+        message(STATUS "Warning: sem_init seems compilable but not executable")
+        message(STATUS "Compilation output: ${seminit_compilmsg}")
+        message(STATUS "Execution output: ${seminit_runmsg}")
+        message(STATUS "Exit value: ${seminit_retval}")
       endif()
+    else()
+      message(STATUS "Warning: sem_init not compilable")
+      message(STATUS "Compilation output: ${seminit_compilmsg}")
     endif()
-    file(REMOVE sem_init)
-  else() 
-    set(HAVE_SEM_INIT 0)  
+    unset(seminit_compilable)
+    unset(seminit_retval)
+    unset(seminit_runmsg)
+    unset(seminit_compilmsg)
   endif()
 
   if(NOT HAVE_SEM_OPEN AND NOT HAVE_SEM_INIT)
-    message(FATAL_ERROR "Semaphores are not usable (neither sem_open nor sem_init is both compilable and executable), but they are mandatory to threads (you may need to mount /dev).")
+    message(FATAL_ERROR "Semaphores are not usable (failed to use both sem_open and sem_init), but they are mandatory to threads (you may need to mount /dev).")
   endif()
 
   set(HAVE_THREAD_CONTEXTS 1)
@@ -703,6 +643,16 @@ set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:\${LD_LIBRARY_PATH:+:$LD_LIBRARY_P
 set(SMPIMAIN smpimain)
 
 configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/mpif.h @ONLY)
+#configure mpif.f90 to build mpi.mod
+if(SMPI_FORTRAN)
+  set(MODULE_MPIF_IN "module mpi")
+  set(MODULE_MPIF_OUT "end module mpi")
+  configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90.generated @ONLY)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90.generated ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90)
+  set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/include/smpi)
+  add_library(mpi SHARED ${CMAKE_BINARY_DIR}/src/smpi/mpif.f90)
+endif()
+
 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()