From: Kefu Chai Date: Wed, 15 Nov 2017 12:57:25 +0000 (+0800) Subject: cmake: WITH_SPDK=ON by default X-Git-Tag: v13.0.1~180^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df446f06cb9db11c0e25aad7b619b1deffc540c0;p=ceph.git cmake: WITH_SPDK=ON by default Signed-off-by: wanjun.lp Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 520c70200779..e2c6f3c64c0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,11 @@ if(WITH_ZFS) set(HAVE_LIBZFS ${ZFS_FOUND}) endif() -option(WITH_SPDK "Enable SPDK" OFF) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") + option(WITH_SPDK "Enable SPDK" ON) +else() + option(WITH_SPDK "Enable SPDK" OFF) +endif() if(WITH_SPDK) include(BuildSPDK) build_spdk() diff --git a/do_freebsd.sh b/do_freebsd.sh index fd8c5b450d58..762b1a9d6fea 100755 --- a/do_freebsd.sh +++ b/do_freebsd.sh @@ -33,6 +33,7 @@ rm -rf build && ./do_cmake.sh "$*" \ -D WITH_CEPHFS=OFF \ -D WITH_EMBEDDED=OFF \ -D WITH_MGR=YES \ + -D WITH_SPDK=OFF \ 2>&1 | tee cmake.log echo start building