Use standard macro to check C++ version.

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fd4f24..e97ab04 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,7 +230,7 @@ if(enable_ns3)
   include(FindNS3)
   if (SIMGRID_HAVE_NS3)
     set(SIMGRID_HAVE_NS3 1)
-    foreach(lib core csma point-to-point internet network applications)
+    foreach(lib core csma point-to-point internet network applications wifi)
       set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
     endforeach()
   else()
@@ -795,9 +795,7 @@ endif()
 
 if (enable_model-checking AND (NOT ("cxx_std_14" IN_LIST known_features)))
   message(WARNING "C++14 not found. The model-checker will use a slow hash function. You should upgrade your compiler")
-  set(SG_HAVE_CPP14 0)
 else()
-  set(SG_HAVE_CPP14 1)
   set_property(TARGET simgrid PROPERTY CXX_STANDARD 14)    
 endif()