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

diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/buildtools/Cmake/Modules/FindNS3.cmake
index b7faf9fe64..65882f3d2b 100644
--- a/buildtools/Cmake/Modules/FindNS3.cmake
+++ b/buildtools/Cmake/Modules/FindNS3.cmake
@@ -1,8 +1,5 @@
 find_library(HAVE_NS3_LIB
     NAME ns3
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{HOME}
     PATH_SUFFIXES lib64 lib ns3/lib
     PATHS
     /opt
@@ -15,9 +12,6 @@ find_library(HAVE_NS3_LIB
 
 find_library(HAVE_NS3_CORE_LIB
     NAME ns3-core
-    HINTS
-    $ENV{LD_LIBRARY_PATH}
-    $ENV{HOME}
     PATH_SUFFIXES lib64 lib ns3/lib
     PATHS
     /opt
@@ -30,8 +24,6 @@ find_library(HAVE_NS3_CORE_LIB
 
 find_path(HAVE_CORE_MODULE_H
 	NAME ns3/core-module.h
-    HINTS
-    $ENV{HOME}
     PATH_SUFFIXES include ns3/include
     PATHS
     /opt
@@ -75,7 +67,7 @@ if(HAVE_CORE_MODULE_H)
         string(REPLACE "/libns3.${LIB_EXE}" ""  HAVE_NS3_LIB "${HAVE_NS3_LIB}")
     endif(HAVE_NS3_LIB)
     if(HAVE_NS3_CORE_LIB)
-        message(STATUS "Warning: NS-3 version > 3.10")
+        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}")
@@ -86,7 +78,6 @@ 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}")
@@ -103,4 +94,8 @@ if(HAVE_NS3)
 	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)
\ No newline at end of file
+endif(HAVE_NS3)
+
+if(HAVE_NS3 AND enable_supernovae)
+    set(enable_supernovae OFF)
+endif(HAVE_NS3 AND enable_supernovae)