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 norelro to link flags (see FG #35).
[simgrid.git]
/
tools
/
cmake
/
MakeLib.cmake
diff --git
a/tools/cmake/MakeLib.cmake
b/tools/cmake/MakeLib.cmake
index
480b934
..
b29b592
100644
(file)
--- a/
tools/cmake/MakeLib.cmake
+++ b/
tools/cmake/MakeLib.cmake
@@
-60,7
+60,7
@@
if (HAVE_BOOST_ADDR2LINE_BACKTRACE)
endif()
if(CMAKE_USE_PTHREADS_INIT)
endif()
if(CMAKE_USE_PTHREADS_INIT)
-
set(SIMGRID_DEP "${SIMGRID_DEP} ${CMAKE_THREAD_LIBS_INIT}"
)
+
target_link_libraries(simgrid ${CMAKE_THREAD_LIBS_INIT}
)
endif()
if(SIMGRID_HAVE_LUA)
endif()
if(SIMGRID_HAVE_LUA)
@@
-133,6
+133,9
@@
if(enable_smpi)
if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12")
set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath")
endif()
if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12")
set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath")
endif()
+ if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\.1")
+ set(SIMGRID_DEP "${SIMGRID_DEP} -lomp")
+ endif()
endif()
endif()
endif()
endif()
endif()
endif()
@@
-165,7
+168,7
@@
endif()
mark_as_advanced(GCCLIBATOMIC_LIBRARY)
if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
mark_as_advanced(GCCLIBATOMIC_LIBRARY)
if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
- set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,-znoseparate-code")
+ set(SIMGRID_DEP "${SIMGRID_DEP} -Wl,-zno
relro -Wl,-zno
separate-code")
endif()
target_link_libraries(simgrid ${SIMGRID_DEP})
endif()
target_link_libraries(simgrid ${SIMGRID_DEP})