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
Remove ancient hack.
[simgrid.git]
/
tools
/
cmake
/
MakeLib.cmake
diff --git
a/tools/cmake/MakeLib.cmake
b/tools/cmake/MakeLib.cmake
index fdd596b0a641dadb74b6f73b6b7fb439456cbaab..551c48eb5eb1c2addb6e82761ce2e8c775e0be5c 100644
(file)
--- a/
tools/cmake/MakeLib.cmake
+++ b/
tools/cmake/MakeLib.cmake
@@
-30,13
+30,17
@@
if("${CMAKE_SYSTEM}" MATCHES "Linux")
add_library(sthread SHARED ${STHREAD_SRC})
set_property(TARGET sthread
APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
add_library(sthread SHARED ${STHREAD_SRC})
set_property(TARGET sthread
APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
- install(TARGETS sthread # install that binary without breaking the rpath on Mac
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/)
target_link_libraries(sthread simgrid)
else()
set(EXTRA_DIST ${EXTRA_DIST} ${STHREAD_SRC})
endif()
target_link_libraries(sthread simgrid)
else()
set(EXTRA_DIST ${EXTRA_DIST} ${STHREAD_SRC})
endif()
+if(HAVE_MMALLOC)
+ add_library(sgmalloc SHARED ${SGMALLOC_SRC})
+ set_property(TARGET sgmalloc
+ APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
+endif()
+
if(enable_model-checking)
add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
target_link_libraries(simgrid-mc simgrid)
if(enable_model-checking)
add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
target_link_libraries(simgrid-mc simgrid)
@@
-135,7
+139,7
@@
if(enable_smpi)
if ("${CMAKE_SYSTEM_VERSION}" STRGREATER_EQUAL "12")
set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath")
endif()
if ("${CMAKE_SYSTEM_VERSION}" STRGREATER_EQUAL "12")
set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath")
endif()
- if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\.1")
+ if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\
\
.1")
set(SIMGRID_DEP "${SIMGRID_DEP} -lomp")
endif()
endif()
set(SIMGRID_DEP "${SIMGRID_DEP} -lomp")
endif()
endif()