From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 27 Feb 2014 13:48:21 +0000 (+0100)
Subject: Some cleanup in FindNS3.cmake.
X-Git-Tag: v3_11~254
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/06c9d54a0bb496cc5193a10ea22dab3ef7631be3

Some cleanup in FindNS3.cmake.
---

diff --git a/buildtools/Cmake/Modules/FindNS3.cmake b/buildtools/Cmake/Modules/FindNS3.cmake
index 2e0afbd126..eb64091aa0 100644
--- a/buildtools/Cmake/Modules/FindNS3.cmake
+++ b/buildtools/Cmake/Modules/FindNS3.cmake
@@ -57,35 +57,24 @@ if(HAVE_CORE_MODULE_H)
     message(STATUS "Warning: NS-3 version <= 3.10")
     set(HAVE_NS3 1)
     set(NS3_VERSION_MINOR 10)
-    string(REPLACE "/libns3.${LIB_EXE}" "" HAVE_NS3_LIB "${HAVE_NS3_LIB}")
+    get_filename_component(NS3_LIBRARY_PATH "${HAVE_NS3_LIB}" PATH)
   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)
-    string(REPLACE "/libns3-core.${LIB_EXE}" "" HAVE_NS3_LIB "${HAVE_NS3_CORE_LIB}")
+    get_filename_component(NS3_LIBRARY_PATH "${HAVE_NS3_CORE_LIB}" PATH)
   endif()
 endif()
 
 if(HAVE_NS3)
-  string(REGEX MATCH "${HAVE_NS3_LIB}" operation "$ENV{LD_LIBRARY_PATH}")
+  string(REGEX MATCH "${NS3_LIBRARY_PATH}" 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()
-
-    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()
-
-    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()
-
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-I${HAVE_CORE_MODULE_H} -L${HAVE_NS3_LIB} ")
-    message(STATUS "TEST: ${CMAKE_CXX_FLAGS}")
+    message(STATUS "Warning: To use NS-3 don't forget to set LD_LIBRARY_PATH with: export LD_LIBRARY_PATH=${NS3_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}")
   endif()
+
+  link_directories(${NS3_LIBRARY_PATH})
+  include_directories(${HAVE_CORE_MODULE_H})
 else()
   message(STATUS "Warning: To use NS-3 Please install ns3 at least version 3.10 (http://www.nsnam.org/releases/)")
 endif()