A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add the Storage::read_async and Storage::write_async methods
[simgrid.git]
/
tools
/
cmake
/
Modules
/
FindNS3.cmake
diff --git
a/tools/cmake/Modules/FindNS3.cmake
b/tools/cmake/Modules/FindNS3.cmake
index
6dd95aa
..
d036843
100644
(file)
--- a/
tools/cmake/Modules/FindNS3.cmake
+++ b/
tools/cmake/Modules/FindNS3.cmake
@@
-13,14
+13,14
@@
# - No proper find_package() integration
## ADDING A NS3 VERSION.
# - No proper find_package() integration
## ADDING A NS3 VERSION.
-# - Add
ns3.${version}-core
to the NAME line of the find_library below
-# - Add
include/ns3{version}
to the PATH_SUFFIXES line of the find_path below
+# - Add
"ns3.${version}-core ns3.${version}-core-debug ns3.${version}-core-optimized"
to the NAME line of the find_library below
+# - Add
"include/ns3{version}"
to the PATH_SUFFIXES line of the find_path below
-set(HAVE_NS3 0)
+set(
SIMGRID_
HAVE_NS3 0)
set(NS3_HINT ${ns3_path} CACHE PATH "Path to search for NS3 lib and include")
find_library(NS3_LIBRARIES
set(NS3_HINT ${ns3_path} CACHE PATH "Path to search for NS3 lib and include")
find_library(NS3_LIBRARIES
- NAME ns3-core ns3.14-core ns3.15-core ns3.16-core ns3.17-core ns3.18-core ns3.19-core ns3.20-core ns3.21-core ns3.22-core ns3.25-core ns3.26-core ns3.2
7-core ns3.28-core
+ NAME ns3-core ns3.14-core ns3.15-core ns3.16-core ns3.17-core ns3.18-core ns3.19-core ns3.20-core ns3.21-core ns3.22-core ns3.25-core ns3.26-core ns3.2
6-core-optimized ns3.26-core-debug ns3.27-core ns3.27-core-optimized ns3.27-core-debug ns3.28-core ns3.28-core-optimized ns3.28-core-debug
PATH_SUFFIXES lib64 lib ns3/lib
PATHS
${NS3_HINT}
PATH_SUFFIXES lib64 lib ns3/lib
PATHS
${NS3_HINT}
@@
-50,20
+50,27
@@
mark_as_advanced(NS3_LIBRARIES)
if(NS3_INCLUDE_DIR)
if(NS3_LIBRARIES)
if(NS3_INCLUDE_DIR)
if(NS3_LIBRARIES)
- set(HAVE_NS3 1)
-
+ set(SIMGRID_HAVE_NS3 1)
+ if(NS3_LIBRARIES MATCHES "-optimized")
+ set (NS3_SUFFIX "-optimized")
+ elseif(NS3_LIBRARIES MATCHES "-debug")
+ set (NS3_SUFFIX "-debug")
+ else()
+ set (NS3_SUFFIX "")
+ endif()
+
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}")
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} in ${NS3_PATH}).")
- if (NOT NS3_LIBRARY_PATH STREQUAL "/usr/lib")
+ message(STATUS "NS-3 found (v${NS3_VERSION}; incl:${NS3_INCLUDE_DIR}; lib: ${NS3_LIBRARY_PATH}).")
+
+ if (NOT NS3_LIBRARY_PATH STREQUAL "/usr/lib")
string(REGEX MATCH "${NS3_LIBRARY_PATH}" MatchResult "$ENV{LD_LIBRARY_PATH}")
if(NOT MatchResult)
string(REGEX MATCH "${NS3_LIBRARY_PATH}" MatchResult "$ENV{LD_LIBRARY_PATH}")
if(NOT MatchResult)
- message(STATUS "Warning: NS3 not installed in system path, and not listed in LD_LIBRARY_PATH."
+ message(STATUS "Warning: NS3 not installed in system path, and not listed in LD_LIBRARY_PATH."
" You want to: export LD_LIBRARY_PATH=${NS3_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}")
endif()
endif()
" You want to: export LD_LIBRARY_PATH=${NS3_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}")
endif()
endif()
@@
-71,7
+78,7
@@
if(NS3_INCLUDE_DIR)
endif()
mark_as_advanced(NS3_LIBRARY_PATH)
endif()
mark_as_advanced(NS3_LIBRARY_PATH)
-if(HAVE_NS3)
+if(
SIMGRID_
HAVE_NS3)
link_directories(${NS3_LIBRARY_PATH})
include_directories(${NS3_INCLUDE_DIR})
else()
link_directories(${NS3_LIBRARY_PATH})
include_directories(${NS3_INCLUDE_DIR})
else()