=== 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-18 10:31:03 +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")
ENDIF()
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
should fix that I believe. (need someone with cmake know-how to check this)
However, this means, that headers for systemtap won't be generated with DTRACE_HEADERS function, though that can be fixed as well. (by moving it earlier) But it is best to have a feature macro for systemtap separately.
=== modified file 'Percona- Server/ cmake/dtrace. cmake' Server/ cmake/dtrace. cmake 2012-06-15 01:35:09 +0000 Server/ cmake/dtrace. cmake 2013-02-18 10:31:03 +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")
ENDIF()
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_
should fix that I believe. (need someone with cmake know-how to check this)
However, this means, that headers for systemtap won't be generated with DTRACE_HEADERS function, though that can be fixed as well. (by moving it earlier) But it is best to have a feature macro for systemtap separately.