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
reduce the shotgun design pattern in the detection of NS3
[simgrid.git]
/
tools
/
cmake
/
Modules
/
FindNS3.cmake
diff --git
a/tools/cmake/Modules/FindNS3.cmake
b/tools/cmake/Modules/FindNS3.cmake
index
750400e
..
fdec6b8
100644
(file)
--- a/
tools/cmake/Modules/FindNS3.cmake
+++ b/
tools/cmake/Modules/FindNS3.cmake
@@
-16,7
+16,7
@@
# - 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
# - 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
@@
-50,7
+50,7
@@
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")
if(NS3_LIBRARIES MATCHES "-optimized")
set (NS3_SUFFIX "-optimized")
elseif(NS3_LIBRARIES MATCHES "-debug")
@@
-65,7
+65,7
@@
if(NS3_INCLUDE_DIR)
# Compute NS3_PATH
string(REGEX REPLACE "(.*)/lib" "\\1" NS3_PATH "${NS3_LIBRARY_PATH}")
# Compute NS3_PATH
string(REGEX REPLACE "(.*)/lib" "\\1" NS3_PATH "${NS3_LIBRARY_PATH}")
- message(STATUS "NS-3 found (v
3.${NS3_VERSION} in ${NS3
_PATH}).")
+ 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 NS3_LIBRARY_PATH STREQUAL "/usr/lib")
string(REGEX MATCH "${NS3_LIBRARY_PATH}" MatchResult "$ENV{LD_LIBRARY_PATH}")
@@
-78,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()