diff options
| author | Vladislav Vaintroub <wlad@sol> | 2009-11-11 12:51:44 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sol> | 2009-11-11 12:51:44 +0000 |
| commit | a6b16ea086b8965e896a12be899b60acf8978f1d (patch) | |
| tree | 765a85019d0fdba6c577a3027a946eafd2c0f3f2 /cmake | |
| parent | 91916e7f054f4afd33bfda327a45589f2e2b7f16 (diff) | |
| download | mariadb-git-a6b16ea086b8965e896a12be899b60acf8978f1d.tar.gz | |
correctly specify working directory for dtrace_prelink. Also, generate _dtrace.o in the object directory
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/dtrace.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake index 5c031e04841..c0f66e4c46c 100644 --- a/cmake/dtrace.cmake +++ b/cmake/dtrace.cmake @@ -74,7 +74,7 @@ MACRO (DTRACE_INSTRUMENT target) # link it together with target. IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${target}_dtrace.o) + SET(outfile ${objdir}/${target}_dtrace.o) ADD_CUSTOM_COMMAND( TARGET ${target} PRE_LINK @@ -84,7 +84,7 @@ MACRO (DTRACE_INSTRUMENT target) -DDFILE=${CMAKE_BINARY_DIR}/include/probes_mysql.d -DDTRACE_FLAGS=${DTRACE_FLAGS} -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake - WORKING_DIRECTORY ${OBJDIR} + WORKING_DIRECTORY ${objdir} ) SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}") ENDIF() |