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
Infrastructure for statically defined tracepoints
[simgrid.git]
/
buildtools
/
Cmake
/
MakeLib.cmake
diff --git
a/buildtools/Cmake/MakeLib.cmake
b/buildtools/Cmake/MakeLib.cmake
index
ef15efa
..
9f15a91
100644
(file)
--- a/
buildtools/Cmake/MakeLib.cmake
+++ b/
buildtools/Cmake/MakeLib.cmake
@@
-12,6
+12,10
@@
if(enable_lib_static)
add_library(simgrid_static STATIC ${simgrid_sources})
endif()
add_library(simgrid_static STATIC ${simgrid_sources})
endif()
+if(enable_ust)
+ ADD_DEPENDENCIES(simgrid simgrid_ust)
+endif()
+
if(enable_java)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
endif()
if(enable_java)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
endif()
@@
-81,6
+85,10
@@
if(HAVE_GTNETS)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
endif()
SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
endif()
+if(enable_mc_content_adressable_pages)
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -lnettle")
+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.
@@
-120,6
+128,12
@@
if(HAVE_BACKTRACE_IN_LIBEXECINFO)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
endif(HAVE_BACKTRACE_IN_LIBEXECINFO)
+# Dependencies from USR
+###################################
+if(enable_ust)
+ set(SIMGRID_DEP "${SIMGRID_DEP} -llttng-ust")
+endif()
+
# Compute the dependencies of SMPI
##################################
if(enable_smpi AND APPLE)
# Compute the dependencies of SMPI
##################################
if(enable_smpi AND APPLE)