From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 24 Jul 2016 10:18:45 +0000 (+0800)
Subject: Merge pull request #10352 from wjwithagen/wip-wjw-freebsd-cmake-2
X-Git-Tag: ses5-milestone5~320
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af1598a3b3aa660a06162d26bb9561c8567f8d0b;p=ceph.git

Merge pull request #10352 from wjwithagen/wip-wjw-freebsd-cmake-2

cmake: work to get inital FreeBSD stuff

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

af1598a3b3aa660a06162d26bb9561c8567f8d0b
diff --cc CMakeLists.txt
index ffae835967dd,79c89d614735..3b6b1e525235
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -17,8 -17,20 +17,20 @@@ if (POLICY CMP0023
  cmake_policy(SET CMP0023 OLD)
  endif (POLICY CMP0023)
  
 -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
  
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+   set(LINUX ON)
+   FIND_PACKAGE(Threads)
+ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+   set(FREEBSD ON)
+   FIND_PACKAGE(Threads)
+ elseif(APPLE)
+   set(OperatingSystem "Mac OS X")
+ else()
+   message(STATUS "No systemtype selected for building")
+ endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ 
  option(WITH_CCACHE "Build with ccache.")
  if(WITH_CCACHE)
    find_program(CCACHE_FOUND ccache)
@@@ -152,17 -172,26 +172,26 @@@ else(ENABLE_SHARED
  endif(ENABLE_SHARED)
  set(CMAKE_POSITION_INDEPENDENT_CODE ${ENABLE_SHARED})
  
 -find_package(execinfo)
 +find_package(Backtrace)
  
- find_package(udev REQUIRED)
- set(HAVE_UDEV ${UDEV_FOUND})
- 
- option(WITH_AIO "AIO is here ON" ON)
- if(${WITH_AIO})
- find_package(aio REQUIRED)
- set(HAVE_LIBAIO ${AIO_FOUND})
- message(STATUS "${AIO_LIBS}")
- endif(${WITH_AIO})
+ if(LINUX)
+   find_package(udev REQUIRED)
+   set(HAVE_UDEV ${UDEV_FOUND})
+ 
+   find_package(aio REQUIRED)
+   set(HAVE_LIBAIO ${AIO_FOUND})
+   message(STATUS "${AIO_LIBS}")
+ 
+   find_package(blkid REQUIRED)
+   set(HAVE_BLKID ${BLKID_FOUND})
+ else()
+   set(HAVE_UDEV OFF)
+   message(STATUS "Not using udev")
+   set(HAVE_LIBAIO OFF)
+   message(STATUS "Not using AIO")
+   set(HAVE_BLKID OFF)
+   message(STATUS "Not using BLKID")
+ endif(LINUX)
  
  option(WITH_OPENLDAP "OPENLDAP is here" ON)
  if(${WITH_OPENLDAP})