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 FindNS3 module to cmake.
[simgrid.git]
/
buildtools
/
Cmake
/
CompleteInFiles.cmake
diff --git
a/buildtools/Cmake/CompleteInFiles.cmake
b/buildtools/Cmake/CompleteInFiles.cmake
index
4f801eb
..
63de957
100644
(file)
--- a/
buildtools/Cmake/CompleteInFiles.cmake
+++ b/
buildtools/Cmake/CompleteInFiles.cmake
@@
-19,6
+19,7
@@
string(TOUPPER ${enable_pcre} enable_pcre)
if(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
include(FindPCRE)
endif(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
if(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
include(FindPCRE)
endif(enable_pcre STREQUAL "AUTO" OR enable_pcre STREQUAL "ON")
+set(HAVE_GTNETS 0)
if(enable_gtnets)
include(FindGTnets)
endif(enable_gtnets)
if(enable_gtnets)
include(FindGTnets)
endif(enable_gtnets)
@@
-28,6
+29,10
@@
endif(enable_smpi)
if(enable_lua)
include(FindLua51Simgrid)
endif(enable_lua)
if(enable_lua)
include(FindLua51Simgrid)
endif(enable_lua)
+set(HAVE_NS3 0)
+if(enable_ns3)
+ include(FindNS3)
+endif(enable_ns3)
# Checks for header libraries functions.
CHECK_LIBRARY_EXISTS(pthread pthread_create "" pthread)
# Checks for header libraries functions.
CHECK_LIBRARY_EXISTS(pthread pthread_create "" pthread)
@@
-637,7
+642,7
@@
set(includedir ${CMAKE_INSTALL_PREFIX}/include)
set(top_builddir ${CMAKE_HOME_DIRECTORY})
set(libdir ${exec_prefix}/lib)
set(CMAKE_LINKARGS "${CMAKE_BINARY_DIR}/lib")
set(top_builddir ${CMAKE_HOME_DIRECTORY})
set(libdir ${exec_prefix}/lib)
set(CMAKE_LINKARGS "${CMAKE_BINARY_DIR}/lib")
-set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:${GTNETS_LIB_PATH}:$LD_LIBRARY_PATH")
+set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:${GTNETS_LIB_PATH}:$
{HAVE_NS3_LIB}:$
LD_LIBRARY_PATH")
configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/smpif.h @ONLY)
configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY)
configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/smpif.h @ONLY)
configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY)