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 haiku support. Because why not.
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
ed680f2
..
cba00c6
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-226,7
+226,7
@@
if(enable_ns3)
set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
endforeach()
else()
set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
endforeach()
else()
- message(FATAL_ERROR "Cannot find
NS
3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
+ message(FATAL_ERROR "Cannot find
ns-
3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
endif()
endif()
endif()
endif()
@@
-405,12
+405,12
@@
mark_as_advanced(PATH_LIBDW_H)
mark_as_advanced(PATH_LIBDW_LIB)
if (enable_model-checking AND enable_ns3)
mark_as_advanced(PATH_LIBDW_LIB)
if (enable_model-checking AND enable_ns3)
- message(FATAL_ERROR "Cannot activate both model-checking and
NS3 bindings: NS
3 pull too much dependencies for the MC to work")
+ message(FATAL_ERROR "Cannot activate both model-checking and
ns-3 bindings: ns-
3 pull too much dependencies for the MC to work")
endif()
if(enable_smpi)
SET(HAVE_SMPI 1)
endif()
if(enable_smpi)
SET(HAVE_SMPI 1)
- if(
"${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux|SunOS"
)
+ if(
NOT WIN32
)
SET(HAVE_PRIVATIZATION 1)
else()
message (STATUS "Warning: no support for SMPI automatic privatization on this platform")
SET(HAVE_PRIVATIZATION 1)
else()
message (STATUS "Warning: no support for SMPI automatic privatization on this platform")
@@
-918,9
+918,9
@@
message(" with LTO ....................: ${enable_lto}")
message("")
if (SIMGRID_HAVE_NS3)
message("")
if (SIMGRID_HAVE_NS3)
- message(" Compile
NS
-3 ................: yes (path: ${NS3_PATH})")
+ message(" Compile
ns
-3 ................: yes (path: ${NS3_PATH})")
else()
else()
- message(" Compile
NS
-3 ................: NO (hint: ${NS3_HINT})")
+ message(" Compile
ns
-3 ................: NO (hint: ${NS3_HINT})")
endif()
if (${Java_FOUND})
endif()
if (${Java_FOUND})