Mercurial > libjeffpc
changeset 695:51e0c2743ac5
cmake: don't lose existing linker flags when processing the mapfile
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Sat, 16 Mar 2019 22:28:30 -0400 |
| parents | bcc31181a255 |
| children | 03eeee76f646 |
| files | cmake/mapfile.cmake |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/mapfile.cmake Sat Mar 16 22:26:48 2019 -0400 +++ b/cmake/mapfile.cmake Sat Mar 16 22:28:30 2019 -0400 @@ -1,5 +1,5 @@ # -# Copyright (c) 2016 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> +# Copyright (c) 2016-2019 Josef 'Jeff' Sipek <jeffpc@josefsipek.net> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -40,8 +40,14 @@ set(ld_script "${CMAKE_CURRENT_SOURCE_DIR}/${mapfile}") set(ld_flag "-Wl,-M '${ld_script}'") endif() + + get_target_property(${tgt}_tmp_link_flags "${tgt}" LINK_FLAGS) + if(NOT "${${tgt}_tmp_link_flags}") + set(${tgt}_tmp_link_flags "") + endif() + set_target_properties("${tgt}" PROPERTIES - LINK_FLAGS "${ld_flag}" + LINK_FLAGS "${ld_flag} ${${tgt}_tmp_link_flags}" LINK_DEPENDS "${ld_script}" ) endmacro()