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
Added reference link to comment in MakeLib.cmake
[simgrid.git]
/
buildtools
/
Cmake
/
MakeLib.cmake
diff --git
a/buildtools/Cmake/MakeLib.cmake
b/buildtools/Cmake/MakeLib.cmake
index
77ac392
..
51093f2
100644
(file)
--- a/
buildtools/Cmake/MakeLib.cmake
+++ b/
buildtools/Cmake/MakeLib.cmake
@@
-12,24
+12,37
@@
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")
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
- set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
AND NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
# FreeBSD from 10.0 provide a internal C++ stack (unused by gcc)
AND NOT ${CMAKE_SYSTEM_VERSION} VERSION_LESS 10.0
AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
# FreeBSD from 10.0 provide a internal C++ stack (unused by gcc)
+ # see https://wiki.freebsd.org/NewC%2B%2BStack
set(SIMGRID_DEP "${SIMGRID_DEP} -lc++")
set(SIMGRID_DEP "${SIMGRID_DEP} -lc++")
-endif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+else()
+ set(SIMGRID_DEP "${SIMGRID_DEP} -lstdc++")
+endif()
if(pthread)
if(${CONTEXT_THREADS})
if(pthread)
if(${CONTEXT_THREADS})
@@
-81,11
+94,18
@@
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.
- SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind")
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
+
+ # Same for libdw
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
# This supposes that the host machine is either an AMD or a X86.
# This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
if(PROCESSOR_x86_64)
# This supposes that the host machine is either an AMD or a X86.
# This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
if(PROCESSOR_x86_64)
@@
-117,6
+137,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)