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
(wip) Move the MCed public API in the same file
[simgrid.git]
/
buildtools
/
Cmake
/
MakeLib.cmake
diff --git
a/buildtools/Cmake/MakeLib.cmake
b/buildtools/Cmake/MakeLib.cmake
index
f73882a
..
91611c9
100644
(file)
--- a/
buildtools/Cmake/MakeLib.cmake
+++ b/
buildtools/Cmake/MakeLib.cmake
@@
-12,12
+12,24
@@
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()
add_dependencies(simgrid maintainer_files)
if(enable_java)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake)
endif()
add_dependencies(simgrid maintainer_files)
+if(enable_model-checking)
+ add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
+ target_link_libraries(simgrid-mc simgrid)
+ set_target_properties(simgrid-mc
+ PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+endif()
+
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
@@
-89,7
+101,7
@@
if(HAVE_MC)
# The availability of libunwind was checked in CompleteInFiles.cmake
# (that includes FindLibunwind.cmake), so simply load it now.
# The availability of libunwind was checked in CompleteInFiles.cmake
# (that includes FindLibunwind.cmake), so simply load it now.
- SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind")
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind
-lunwind-ptrace
")
# Same for libdw
SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
# Same for libdw
SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
@@
-124,6
+136,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)