cmake: only create sysctl file on linux

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

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 89a48189ea7b9bd58db1bc95ccd7b3d9fb9b1bb3)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b3fbc7fd61702296587087ef0c2844c3d19f347..78c1c36ac8fc60883dfeaaa4f50b3321265f3879 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -602,7 +602,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 93cd7771538fa4f345d9adafd759983f62ee144c..682541b058e5203e83e02fb6e4da219161aaaf66 100644 (file)
--- 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)