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
[mc] Move code in simgrid::mc
[simgrid.git]
/
tools
/
cmake
/
MakeLib.cmake
diff --git
a/tools/cmake/MakeLib.cmake
b/tools/cmake/MakeLib.cmake
index
b21a0ce
..
4115a97
100644
(file)
--- a/
tools/cmake/MakeLib.cmake
+++ b/
tools/cmake/MakeLib.cmake
@@
-8,10
+8,6
@@
add_library(simgrid SHARED ${simgrid_sources})
set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
add_library(simgrid SHARED ${simgrid_sources})
set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
-if(enable_ust)
- ADD_DEPENDENCIES(simgrid simgrid_ust)
-endif()
-
add_dependencies(simgrid maintainer_files)
if(enable_model-checking)
add_dependencies(simgrid maintainer_files)
if(enable_model-checking)
@@
-25,11
+21,11
@@
endif()
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
# Compute the dependencies of SimGrid
#####################################
set(SIMGRID_DEP "-lm")
-if (HAVE_BOOST_CONTEXT)
+if (HAVE_BOOST_CONTEXT
S
)
set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
endif()
set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
endif()
-if(HAVE_PTHREAD AND ${
CONTEXT_THREAD
S} AND NOT APPLE)
+if(HAVE_PTHREAD AND ${
HAVE_THREAD_CONTEXT
S} AND NOT APPLE)
# Clang on recent Mac OS X is not happy about -pthread.
SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
endif()
# Clang on recent Mac OS X is not happy about -pthread.
SET(SIMGRID_DEP "${SIMGRID_DEP} -pthread")
endif()
@@
-70,10
+66,9
@@
if(HAVE_GRAPHVIZ)
endif()
endif()
endif()
endif()
-if(
HAVE_LIBSIGC++
)
+if(
SIMGRID_HAVE_LIBSIG
)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
add_definitions(-DLIBSIGC)
SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
add_definitions(-DLIBSIGC)
- set(SIMGRID_HAVE_LIBSIG 1)
endif()
if(HAVE_MC)
endif()
if(HAVE_MC)
@@
-93,8
+88,8
@@
if(HAVE_MC)
endif()
endif()
endif()
endif()
-if(
MMALLOC_WANT_OVERRIDE_LEGACY
AND HAVE_GNU_LD)
- SET(SIMGRID_DEP "${SIMGRID_DEP}
${DL_LIBRARY}
")
+if(
HAVE_MC
AND HAVE_GNU_LD)
+ SET(SIMGRID_DEP "${SIMGRID_DEP}
-ldl
")
endif()
if(HAVE_NS3)
endif()
if(HAVE_NS3)
@@
-109,12
+104,6
@@
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)