summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@sol>2009-12-01 18:28:13 +0000
committerVladislav Vaintroub <wlad@sol>2009-12-01 18:28:13 +0000
commitf7269ba0c7726b94f1dcc1be06dedb8ea2357bb4 (patch)
tree290987a54abdda4cef0ddbe235b6173d037b6b87 /cmake
parenta2a276b200926a747c7cd2c8d2b8ce420fc2200d (diff)
downloadmariadb-git-f7269ba0c7726b94f1dcc1be06dedb8ea2357bb4.tar.gz
fix build errors
Diffstat (limited to 'cmake')
-rw-r--r--cmake/dtrace.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
index c0f66e4c46c..58fbbba022c 100644
--- a/cmake/dtrace.cmake
+++ b/cmake/dtrace.cmake
@@ -86,7 +86,13 @@ MACRO (DTRACE_INSTRUMENT target)
-P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
WORKING_DIRECTORY ${objdir}
)
- SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}")
+ GET_TARGET_PROPERTY(target_link_flags ${target} LINK_FLAGS)
+ IF(NOT target_link_flags)
+ SET(target_link_flags)
+ ENDIF()
+
+ SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS
+ "${target_link_flags} ${outfile}")
ENDIF()
ENDIF()
ENDMACRO()