With this patch:
=== modified file 'Percona-Server/CMakeLists.txt' --- Percona-Server/CMakeLists.txt 2013-02-06 06:10:43 +0000 +++ Percona-Server/CMakeLists.txt 2013-02-20 12:53:32 +0000 @@ -150,6 +150,7 @@ ENDIF() ENDIF()
+OPTION(ENABLE_DTRACE "Enable Dtrace profiling" OFF) # Add macros INCLUDE(character_sets) INCLUDE(zlib)
=== modified file 'Percona-Server/cmake/dtrace.cmake' --- Percona-Server/cmake/dtrace.cmake 2012-06-15 01:35:09 +0000 +++ Percona-Server/cmake/dtrace.cmake 2013-02-20 13:49:12 +0000 @@ -38,6 +38,8 @@ IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT BUGGY_GCC_NO_DTRACE_MODULES) SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace") + ELSE() + SET(ENABLE_DTRACE OFF CACHE BOOL "Enable dtrace" FORCE) ENDIF() SET(HAVE_DTRACE ${ENABLE_DTRACE}) IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt' --- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-01-16 13:23:11 +0000 +++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-02-20 14:36:27 +0000 @@ -29,6 +29,6 @@ SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c) MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) - MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY) + MYSQL_ADD_PLUGIN(dialog src/dialog.c ${CMAKE_SOURCE_DIR}/libmysql/get_password.c MODULE_ONLY) ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R) ENDIF(WITH_PAM)
it builds even after -DENABLE_DTRACE=ON, it needs to be verified for correctness later.
With this patch:
=== modified file 'Percona- Server/ CMakeLists. txt' Server/ CMakeLists. txt 2013-02-06 06:10:43 +0000 Server/ CMakeLists. txt 2013-02-20 12:53:32 +0000
--- Percona-
+++ Percona-
@@ -150,6 +150,7 @@
ENDIF()
ENDIF()
+OPTION( ENABLE_ DTRACE "Enable Dtrace profiling" OFF) character_ sets)
# Add macros
INCLUDE(
INCLUDE(zlib)
=== modified file 'Percona- Server/ cmake/dtrace. cmake' Server/ cmake/dtrace. cmake 2012-06-15 01:35:09 +0000 Server/ cmake/dtrace. cmake 2013-02-20 13:49:12 +0000 NO_DTRACE_ MODULES) ENABLE_ DTRACE ON CACHE BOOL "Enable dtrace") SYSTEM_ NAME MATCHES "SunOS")
--- Percona-
+++ Percona-
@@ -38,6 +38,8 @@
IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
AND NOT BUGGY_GCC_
SET(
+ ELSE()
+ SET(ENABLE_DTRACE OFF CACHE BOOL "Enable dtrace" FORCE)
ENDIF()
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_
=== modified file 'Percona- Server/ plugin/ percona- pam-for- mysql/CMakeList s.txt' Server/ plugin/ percona- pam-for- mysql/CMakeList s.txt 2013-01-16 13:23:11 +0000 Server/ plugin/ percona- pam-for- mysql/CMakeList s.txt 2013-02-20 14:36:27 +0000 AUTH_PAM_ COMPAT_ SOURCES ${AUTH_ PAM_COMMON_ SOURCES} src/auth_ pam_compat. c) ADD_PLUGIN( auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY) ADD_PLUGIN( auth_pam_ compat ${AUTH_ PAM_COMPAT_ SOURCES} LINK_LIBRARIES pam MODULE_ONLY) PLUGIN( dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY) PLUGIN( dialog src/dialog.c ${CMAKE_ SOURCE_ DIR}/libmysql/ get_password. c MODULE_ONLY)
--- Percona-
+++ Percona-
@@ -29,6 +29,6 @@
SET(
MYSQL_
MYSQL_
- MYSQL_ADD_
+ MYSQL_ADD_
ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
ENDIF(WITH_PAM)
it builds even after -DENABLE_DTRACE=ON, it needs to be verified
for correctness later.