From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 25 Jul 2015 12:17:01 +0000 (+0200)
Subject: NS3 libraries were not versionned on Ubuntu Precise
X-Git-Tag: v3_12~405
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3f39df9e2a9e798f07a880c9a03ec8fe20dabe79

NS3 libraries were not versionned on Ubuntu Precise
---

diff --git a/buildtools/Cmake/MakeLib.cmake b/buildtools/Cmake/MakeLib.cmake
index e9777ee78f..2f46f6d2ac 100644
--- a/buildtools/Cmake/MakeLib.cmake
+++ b/buildtools/Cmake/MakeLib.cmake
@@ -129,7 +129,7 @@ if(MMALLOC_WANT_OVERRIDE_LEGACY AND HAVE_GNU_LD)
 endif()
 
 if(HAVE_NS3)
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lns3.${NS3_VERSION_MINOR}-core -lns3.${NS3_VERSION_MINOR}-csma -lns3.${NS3_VERSION_MINOR}-point-to-point -lns3.${NS3_VERSION_MINOR}-internet -lns3.${NS3_VERSION_MINOR}-applications")
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-core -lns${NS3_VERSION}-csma -lns${NS3_VERSION}-point-to-point -lns${NS3_VERSION}-internet -lns${NS3_VERSION}-applications")
 endif()
 
 if(HAVE_POSIX_GETTIME)
diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/buildtools/Cmake/Modules/FindNS3.cmake
index 075be6d360..91adb367fb 100644
--- a/buildtools/Cmake/Modules/FindNS3.cmake
+++ b/buildtools/Cmake/Modules/FindNS3.cmake
@@ -56,13 +56,13 @@ if(NS3_INCLUDE_DIR)
   if(NS3_LIBRARIES)
     set(HAVE_NS3 1)
     
-    string(REGEX REPLACE ".*ns3.([0-9]+)-core.*" "\\1" NS3_VERSION_MINOR "${NS3_LIBRARIES}")
+    string(REGEX REPLACE ".*ns([.0-9]+)-core.*" "\\1" NS3_VERSION "${NS3_LIBRARIES}")
     get_filename_component(NS3_LIBRARY_PATH "${NS3_LIBRARIES}" PATH)
 
     # Compute NS3_PATH
     string(REGEX REPLACE "(.*)/lib" "\\1" NS3_PATH "${NS3_LIBRARY_PATH}")
     
-    message(STATUS "NS-3 found (v3.${NS3_VERSION_MINOR} in ${NS3_PATH}).")
+    message(STATUS "NS-3 found (v3.${NS3_VERSION} in ${NS3_PATH}).")
 
     if (NOT NS3_LIBRARY_PATH STREQUAL "/usr/lib") 
       string(REGEX MATCH "${NS3_LIBRARY_PATH}" MatchResult "$ENV{LD_LIBRARY_PATH}")
@@ -75,7 +75,7 @@ if(NS3_INCLUDE_DIR)
 endif()
 mark_as_advanced(NS3_LIBRARY_PATH)
 
-message("NS3_VERSION_MINOR: ${NS3_VERSION_MINOR}")
+message("NS3_VERSION: ${NS3_VERSION}")
 message("NS3_LIBRARIES: ${NS3_LIBRARIES}")
 
 if(HAVE_NS3)