diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-25 11:06:16 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-25 11:06:16 -0400 |
commit | 4f1c1975b5f3d98321ad9e5b6f952c166d3606a7 (patch) | |
tree | 50c83e846f4a4d538b94bce41201d4a2847a852d /cmake | |
parent | 9c89b84d46e0645820acb9e3cc339af10c68cfb7 (diff) | |
parent | 0991e19e9d38f7475390276c0557c2390e4d93c9 (diff) | |
download | mariadb-git-4f1c1975b5f3d98321ad9e5b6f952c166d3606a7.tar.gz |
Merge tag 'mariadb-5.5.49' into 5.5-galera
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/dtrace.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake index 5d0bb7ff8c9..3edcdc4c1c5 100644 --- a/cmake/dtrace.cmake +++ b/cmake/dtrace.cmake @@ -86,6 +86,9 @@ IF(ENABLE_DTRACE) ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h ) +ELSE() + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/probes_mysql_nodtrace.h.in + ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h COPYONLY) ENDIF() FUNCTION(DTRACE_INSTRUMENT target) |