From: Kefu Chai <kchai@redhat.com>
Date: Mon, 20 Nov 2017 07:42:09 +0000 (+0800)
Subject: cmake: only create sysctl file on linux
X-Git-Tag: v13.0.1~131^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89a48189ea7b9bd58db1bc95ccd7b3d9fb9b1bb3;p=ceph.git

cmake: only create sysctl file on linux

and check 64bit platform by using the sizeof(void*)

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f8a11391e95..ed3de9529c74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -604,7 +604,9 @@ if(WITH_SYSTEMD)
   add_subdirectory(systemd)
 endif()
 
-add_subdirectory(etc/sysctl)
+if(LINUX)
+  add_subdirectory(etc/sysctl)
+endif()
 
 include(CTags)
 option(CTAG_EXCLUDES "Exclude files/directories when running ctag.")
diff --git a/etc/sysctl/CMakeLists.txt b/etc/sysctl/CMakeLists.txt
index 93cd7771538f..682541b058e5 100644
--- a/etc/sysctl/CMakeLists.txt
+++ b/etc/sysctl/CMakeLists.txt
@@ -1,8 +1,9 @@
-if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|arm|ARM")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   # 4194304 is the maximum limit possible on 64-bit CONFIG_BASE_FULL kernels.
   # Keep the default for 32-bit systems.
   set(sysctl_pid_max "kernel.pid_max = 4194304")
 endif()
 
 configure_file(90-ceph-osd.conf.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf @ONLY)
+  ${CMAKE_CURRENT_SOURCE_DIR}/90-ceph-osd.conf
+  @ONLY)