X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3dabc5eb26d7bc8b1e29b3aa52c74368c6bb699..d4d7c26c39b6c6f70b0b70871338b890db1ed257:/buildtools/Cmake/Modules/FindNS3.cmake

diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/buildtools/Cmake/Modules/FindNS3.cmake
index aca50fd101..c30f7665f2 100644
--- a/buildtools/Cmake/Modules/FindNS3.cmake
+++ b/buildtools/Cmake/Modules/FindNS3.cmake
@@ -1,9 +1,18 @@
 find_library(HAVE_NS3_LIB
     NAME ns3
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{HOME}
-    PATH_SUFFIXES lib64 lib lib64/ns3 lib/ns3
+    PATH_SUFFIXES lib64 lib ns3/lib
+    PATHS
+    /opt
+    /opt/local
+    /opt/csw
+    /sw
+    /usr
+    ${ns3_path}
+)
+
+find_library(HAVE_NS3_CORE_LIB
+    NAME ns3-core
+    PATH_SUFFIXES lib64 lib ns3/lib
     PATHS
     /opt
     /opt/local
@@ -15,9 +24,7 @@ find_library(HAVE_NS3_LIB
 
 find_path(HAVE_CORE_MODULE_H
 	NAME ns3/core-module.h
-    HINTS
-    $ENV{HOME}
-    PATH_SUFFIXES include include/ns3
+    PATH_SUFFIXES include ns3/include
     PATHS
     /opt
     /opt/local
@@ -43,16 +50,35 @@ message(STATUS "Looking for lib ns3 - not found")
 endif(HAVE_NS3_LIB)
 mark_as_advanced(HAVE_NS3_LIB)
 
-if(HAVE_NS3_LIB AND HAVE_CORE_MODULE_H)
-	set(HAVE_NS3 1)
-	string(REPLACE "/libns3.${LIB_EXE}" ""  HAVE_NS3_LIB "${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)
+message(STATUS "Looking for lib ns3-core - not found")
+endif(HAVE_NS3_CORE_LIB)
+mark_as_advanced(HAVE_NS3_LIB)
+mark_as_advanced(HAVE_NS3_CORE_LIB)
+
+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)
+    if(HAVE_NS3_CORE_LIB)
+        message(STATUS "NS-3 version > 3.10")
+        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)
+
+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}")
 		set(HAVE_NS3 0)
-		
 	else(NOT operation)
 	
 		string(REGEX MATCH "-L${HAVE_NS3_LIB} " operation1 "${CMAKE_C_FLAGS}")
@@ -67,5 +93,10 @@ if(HAVE_NS3_LIB AND HAVE_CORE_MODULE_H)
 	
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_CORE_MODULE_H} -L${HAVE_NS3_LIB} ")
 	endif(NOT operation)		
+else(HAVE_NS3)
+    message(STATUS "Warning: To use NS-3 Please install ns3 at least version 3.10 (http://www.nsnam.org/releases/)")
+endif(HAVE_NS3)
 
-endif(HAVE_NS3_LIB AND HAVE_CORE_MODULE_H)
\ No newline at end of file
+if(HAVE_NS3 AND enable_supernovae)
+    set(enable_supernovae OFF)
+endif(HAVE_NS3 AND enable_supernovae)
\ No newline at end of file