diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
| commit | 271fed41061e25faa47b7a28108cf101ebb3551d (patch) | |
| tree | 733bf84d468a1d47c71c87cfcee33098a090e3c5 /cmake | |
| parent | ff26d93a8c25d667709180ad13a090309631990d (diff) | |
| parent | e1385f2083f782d7064db3c0059fcca45bfcb2a4 (diff) | |
| download | mariadb-git-271fed41061e25faa47b7a28108cf101ebb3551d.tar.gz | |
Merge branch '5.5' into 10.0
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) |