From 95740bc5c5f82c13f07bea8b10f20b87d8f5f9a9 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 14 Feb 2016 22:16:50 +0100 Subject: [PATCH] dtrace in cmake 1. ignore generated dtrace files 2. don't rewrite probes_mysql_nodtrace.h in-place --- .gitignore | 3 +++ cmake/dtrace.cmake | 3 +++ .../{probes_mysql_nodtrace.h => probes_mysql_nodtrace.h.in} | 0 3 files changed, 6 insertions(+) rename include/{probes_mysql_nodtrace.h => probes_mysql_nodtrace.h.in} (100%) diff --git a/.gitignore b/.gitignore index c3d50ee335b..b780ca88de0 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,9 @@ include/mysql_version.h include/mysqld_ername.h include/mysqld_error.h include/sql_state.h +include/probes_mysql.d +include/probes_mysql_dtrace.h +include/probes_mysql_nodtrace.h info_macros.cmake libmysql*/libmysql*_exports_file.cc libmysql*/merge_archives_mysql*.cmake 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) diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h.in similarity index 100% rename from include/probes_mysql_nodtrace.h rename to include/probes_mysql_nodtrace.h.in