another thing that SMPI cannot do yet

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31f0405..77973cc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,12 +87,15 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi)
     if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
       set(SMPI_Fortran_FLAGS "\"-fpic\" \"-ff2c\" \"-fno-second-underscore\"")
       set(SMPI_Fortran_LIBS "\"-lgfortran\"")
+      set(SMPI_GFORTRAN 1)
     elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
       set(SMPI_Fortran_FLAGS "\"-fPIC\" \"-nofor-main\"")
       set(SMPI_Fortran_LIBS "\"-lifcore\"")
+      set(SMPI_IFORT 1)
     elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI|Flang") # flang
       set(SMPI_Fortran_FLAGS "\"-fPIC\"")
       set(SMPI_Fortran_LIBS "")
+      set(SMPI_FLANG 1)
     endif()
 
     set(SMPI_FORTRAN 1)
@@ -105,7 +108,7 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "20")
+set(SIMGRID_VERSION_MINOR "21")
 set(SIMGRID_VERSION_PATCH "90")
 set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
@@ -136,9 +139,9 @@ execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION
 string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 
 ### Set the library providing dlopen
-if("${CMAKE_SYSTEM}" MATCHES "Linux")
+if("${CMAKE_SYSTEM_NAME}" MATCHES "kFreeBSD|Linux")
   find_library(DL_LIBRARY dl)
-endif("${CMAKE_SYSTEM}" MATCHES "Linux")
+endif()
 
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)