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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e294a4ef1c..b16aeab13a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi)
     elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
       set(SMPI_Fortran_FLAGS "\"-fPIC\" \"-nofor-main\"")
       set(SMPI_Fortran_LIBS "\"-lifcore\"")
-    elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI") # flang
+    elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI|Flang") # flang
       set(SMPI_Fortran_FLAGS "\"-fPIC\"")
       set(SMPI_Fortran_LIBS "")
     endif()
@@ -234,7 +234,9 @@ if(enable_ns3)
   include(FindNS3)
   if (SIMGRID_HAVE_NS3)
     set(SIMGRID_HAVE_NS3 1)
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-core${NS3_SUFFIX} -lns${NS3_VERSION}-csma${NS3_SUFFIX} -lns${NS3_VERSION}-point-to-point${NS3_SUFFIX} -lns${NS3_VERSION}-internet${NS3_SUFFIX} -lns${NS3_VERSION}-network${NS3_SUFFIX} -lns${NS3_VERSION}-applications${NS3_SUFFIX}")
+    foreach(lib core csma point-to-point internet network applications)
+      set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
+    endforeach()
   else()
     message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
   endif()
@@ -616,6 +618,10 @@ endif()
 file(REMOVE test_stackgrowth)
 #--------------------------------------------------------------------------------------------------
 
+if(enable_address_sanitizer OR enable_thread_sanitizer OR enable_undefined_sanitizer)
+  set(HAVE_SANITIZER 1)
+endif()
+
 ### check for addr2line
 find_path(ADDR2LINE NAMES addr2line	PATHS NO_DEFAULT_PATHS)
 if(ADDR2LINE)