Commit 12c7945b authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

correctly specify working directory for dtrace_prelink. Also, generate...

correctly specify working directory for dtrace_prelink. Also, generate _dtrace.o in the object directory
parent 3d6465d9
...@@ -74,7 +74,7 @@ MACRO (DTRACE_INSTRUMENT target) ...@@ -74,7 +74,7 @@ MACRO (DTRACE_INSTRUMENT target)
# link it together with target. # link it together with target.
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir) 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( ADD_CUSTOM_COMMAND(
TARGET ${target} PRE_LINK TARGET ${target} PRE_LINK
...@@ -84,7 +84,7 @@ MACRO (DTRACE_INSTRUMENT target) ...@@ -84,7 +84,7 @@ MACRO (DTRACE_INSTRUMENT target)
-DDFILE=${CMAKE_BINARY_DIR}/include/probes_mysql.d -DDFILE=${CMAKE_BINARY_DIR}/include/probes_mysql.d
-DDTRACE_FLAGS=${DTRACE_FLAGS} -DDTRACE_FLAGS=${DTRACE_FLAGS}
-P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
WORKING_DIRECTORY ${OBJDIR} WORKING_DIRECTORY ${objdir}
) )
SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}") SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}")
ENDIF() ENDIF()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment