From: Kefu Chai Date: Tue, 4 Jul 2017 12:20:12 +0000 (+0800) Subject: Merge pull request #15305 from wjwithagen/wip-wjw-HAVE_BABELTRACE X-Git-Tag: v12.1.1~196 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d723b8a667018a37817a6660d658969b40cc6b88;p=ceph.git Merge pull request #15305 from wjwithagen/wip-wjw-HAVE_BABELTRACE cmake: Rewrite HAVE_BABELTRACE option to WITH_ Reviewed-by: Kefu Chai --- d723b8a667018a37817a6660d658969b40cc6b88 diff --cc CMakeLists.txt index 4903fbe945b5,2cfd6b7921cb..b7d42fcc90ba --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -465,10 -460,10 +466,9 @@@ if(WITH_BABELTRACE set(HAVE_BABELTRACE_BABELTRACE_H ${BABELTRACE_FOUND}) set(HAVE_BABELTRACE_CTF_EVENTS_H ${BABELTRACE_FOUND}) set(HAVE_BABELTRACE_CTF_ITERATOR_H ${BABELTRACE_FOUND}) - endif(${HAVE_BABELTRACE}) + endif(WITH_BABELTRACE) option(DEBUG_GATHER "C_Gather debugging is enabled" ON) -option(HAVE_LIBZFS "LibZFS is enabled" OFF) option(ENABLE_COVERAGE "Coverage is enabled" OFF) option(PG_DEBUG_REFS "PG Ref debugging is enabled" OFF)