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
Add a FreeBSD backend for get_memory_map(), allow to enable smpi privatization.
[simgrid.git]
/
tools
/
cmake
/
MakeLib.cmake
diff --git
a/tools/cmake/MakeLib.cmake
b/tools/cmake/MakeLib.cmake
index
10bf2ea
..
19f9452
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()
@@
-57,7
+53,11
@@
if(HAVE_LUA)
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test
)
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/simdag/
COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/examples/simdag/simgrid.${LIB_EXE} #for test
)
- SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} -ldl")
+ SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} ${DL_LIBRARY}")
+endif()
+
+if(HAVE_PAPI)
+ SET(SIMGRID_DEP "${SIMGRID_DEP} -lpapi")
endif()
if(HAVE_GRAPHVIZ)
endif()
if(HAVE_GRAPHVIZ)
@@
-70,10
+70,6
@@
if(HAVE_GRAPHVIZ)
endif()
endif()
endif()
endif()
-if(HAVE_LIBSIGC++)
- SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
-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.
@@
-91,7
+87,7
@@
if(HAVE_MC)
endif()
endif()
endif()
endif()
-if(
MMALLOC_WANT_OVERRIDE_LEGACY
AND HAVE_GNU_LD)
+if(
HAVE_MC
AND HAVE_GNU_LD)
SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
endif()
SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
endif()
@@
-103,14
+99,8
@@
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)
-
-# Dependencies from USR
-###################################
-if(enable_ust)
- set(SIMGRID_DEP "${SIMGRID_DEP} -llttng-ust")
+if("${CMAKE_SYSTEM}" MATCHES "FreeBSD")
+ set(SIMGRID_DEP "${SIMGRID_DEP} -lprocstat")
endif()
# Compute the dependencies of SMPI
endif()
# Compute the dependencies of SMPI
@@
-123,6
+113,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()