[mc] Fix cleanup of info->types

[simgrid.git] / buildtools / Cmake / Modules / FindNS3.cmake

diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/buildtools/Cmake/Modules/FindNS3.cmake
index d9a2687..2e0afbd 100644 (file)
--- a/buildtools/Cmake/Modules/FindNS3.cmake
+++ b/buildtools/Cmake/Modules/FindNS3.cmake
@@ -13,7 +13,7 @@ find_library(HAVE_NS3_LIB
   )
 
 find_library(HAVE_NS3_CORE_LIB
-  NAME ns3-core
+  NAME ns3-core ns3.14-core ns3.17-core
   PATH_SUFFIXES lib64 lib ns3/lib
   PATHS
   ${ns3_path}
@@ -21,7 +21,7 @@ find_library(HAVE_NS3_CORE_LIB
 
 find_path(HAVE_CORE_MODULE_H
   NAME ns3/core-module.h
-  PATH_SUFFIXES include ns3/include include/ns3.14.1
+  PATH_SUFFIXES include ns3/include include/ns3.14.1 include/ns3.17
   PATHS
   ${ns3_path}
   )
@@ -29,25 +29,25 @@ find_path(HAVE_CORE_MODULE_H
 message(STATUS "Looking for core-module.h")
 if(HAVE_CORE_MODULE_H)
   message(STATUS "Looking for core-module.h - found")
-else(HAVE_CORE_MODULE_H)
+else()
   message(STATUS "Looking for core-module.h - not found")
-endif(HAVE_CORE_MODULE_H)
+endif()
 mark_as_advanced(HAVE_CORE_MODULE_H)
 
 message(STATUS "Looking for lib ns3")
 if(HAVE_NS3_LIB)
   message(STATUS "Looking for lib ns3 - found")
-else(HAVE_NS3_LIB)
+else()
   message(STATUS "Looking for lib ns3 - not found")
-endif(HAVE_NS3_LIB)
+endif()
 mark_as_advanced(HAVE_NS3_LIB)
 
 message(STATUS "Looking for lib ns3-core")
 if(HAVE_NS3_CORE_LIB)
   message(STATUS "Looking for lib ns3-core - found")
-else(HAVE_NS3_CORE_LIB)
+else()
   message(STATUS "Looking for lib ns3-core - not found")
-endif(HAVE_NS3_CORE_LIB)
+endif()
 
 mark_as_advanced(HAVE_NS3_LIB)
 mark_as_advanced(HAVE_NS3_CORE_LIB)
@@ -56,39 +56,36 @@ if(HAVE_CORE_MODULE_H)
   if(HAVE_NS3_LIB)
     message(STATUS "Warning: NS-3 version <= 3.10")
     set(HAVE_NS3 1)
-    set(NS3_VERSION 310)
-    string(REPLACE "/libns3.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_LIB}")
-  endif(HAVE_NS3_LIB)
+    set(NS3_VERSION_MINOR 10)
+    string(REPLACE "/libns3.${LIB_EXE}" "" HAVE_NS3_LIB "${HAVE_NS3_LIB}")
+  endif()
   if(HAVE_NS3_CORE_LIB)
     message(STATUS "NS-3 version > 3.10")
+    string(REGEX REPLACE ".*ns3.([0-9]+)-core.*" "\\1" NS3_VERSION_MINOR "${HAVE_NS3_CORE_LIB}")
     set(HAVE_NS3 1)
-    set(NS3_VERSION 312)
-    string(REPLACE "/libns3-core.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_CORE_LIB}")
-  endif(HAVE_NS3_CORE_LIB)
-endif(HAVE_CORE_MODULE_H)
+    string(REPLACE "/libns3-core.${LIB_EXE}" "" HAVE_NS3_LIB "${HAVE_NS3_CORE_LIB}")
+  endif()
+endif()
 
 if(HAVE_NS3)
   string(REGEX MATCH "${HAVE_NS3_LIB}" operation "$ENV{LD_LIBRARY_PATH}")
   if(NOT operation)
     message(STATUS "Warning: To use NS-3 don't forget to set LD_LIBRARY_PATH with:     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HAVE_NS3_LIB}")
-  else(NOT operation)
+  else()
 
     string(REGEX MATCH "-L${HAVE_NS3_LIB} " operation1 "${CMAKE_C_FLAGS}")
     if(NOT operation1)
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-L${HAVE_NS3_LIB} ")
-    endif(NOT operation1)
+    endif()
 
     string(REGEX MATCH "-I${HAVE_CORE_MODULE_H} " operation1 "${CMAKE_C_FLAGS}")
     if(NOT operation1)
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${HAVE_CORE_MODULE_H} ")
-    endif(NOT operation1)
+    endif()
 
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_CORE_MODULE_H} -L${HAVE_NS3_LIB} ")
-  endif(NOT operation)
-else(HAVE_NS3)
+    message(STATUS "TEST: ${CMAKE_CXX_FLAGS}")
+  endif()
+else()
   message(STATUS "Warning: To use NS-3 Please install ns3 at least version 3.10 (http://www.nsnam.org/releases/)")
-endif(HAVE_NS3)
-
-if(HAVE_NS3 AND enable_supernovae)
-  set(enable_supernovae OFF)
-endif(HAVE_NS3 AND enable_supernovae)
+endif()