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
plug leak and cosmetics
[simgrid.git]
/
tools
/
cmake
/
MakeLib.cmake
diff --git
a/tools/cmake/MakeLib.cmake
b/tools/cmake/MakeLib.cmake
index
4115a97
..
29c3b56
100644
(file)
--- a/
tools/cmake/MakeLib.cmake
+++ b/
tools/cmake/MakeLib.cmake
@@
-56,6
+56,10
@@
if(HAVE_LUA)
SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} -ldl")
endif()
SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} -ldl")
endif()
+if(HAVE_PAPI)
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -lpapi")
+endif()
+
if(HAVE_GRAPHVIZ)
if(HAVE_CGRAPH_LIB)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
if(HAVE_GRAPHVIZ)
if(HAVE_CGRAPH_LIB)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lcgraph")
@@
-66,11
+70,6
@@
if(HAVE_GRAPHVIZ)
endif()
endif()
endif()
endif()
-if(SIMGRID_HAVE_LIBSIG)
- SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
- add_definitions(-DLIBSIGC)
-endif()
-
if(HAVE_MC)
# The availability of libunwind was checked in CompleteInFiles.cmake
# (that includes FindLibunwind.cmake), so simply load it now.
if(HAVE_MC)
# The availability of libunwind was checked in CompleteInFiles.cmake
# (that includes FindLibunwind.cmake), so simply load it now.
@@
-100,10
+99,6
@@
if(HAVE_POSIX_GETTIME)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
endif()
SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
endif()
-if(HAVE_BACKTRACE_IN_LIBEXECINFO)
- SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
-endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
-
# Compute the dependencies of SMPI
##################################
if(enable_smpi AND APPLE)
# Compute the dependencies of SMPI
##################################
if(enable_smpi AND APPLE)
@@
-114,6
+109,9
@@
target_link_libraries(simgrid ${SIMGRID_DEP})
# Dependencies from maintainer mode
###################################
# Dependencies from maintainer mode
###################################
+if(enable_maintainer_mode)
+ add_dependencies(simgrid smpi_generated_headers_call_location_tracing)
+endif()
if(enable_maintainer_mode AND PYTHON_EXE)
add_dependencies(simgrid simcalls_generated_src)
endif()
if(enable_maintainer_mode AND PYTHON_EXE)
add_dependencies(simgrid simcalls_generated_src)
endif()