set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Default BUILD_TYPE is RelWithDebInfo, other options are: Debug, Release, and MinSizeRel." FORCE)
+ set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Default BUILD_TYPE is RelWithDebInfo, other options are: Debug, Release, and MinSizeRel." FORCE)
endif()
if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
msg/DispatchQueue.cc
msg/Message.cc
mon/PGMap.cc
+ mgr/ServiceMap.cc
osd/ECMsgTypes.cc
osd/HitSet.cc
common/RefCountedObj.cc
common/ceph_hash.cc
common/ceph_strings.cc
common/ceph_frag.cc
+ common/options.cc
common/config.cc
- common/config_validators.cc
common/utf8.c
common/mime.c
common/strtol.cc
common/bit_str.cc
osdc/Striper.cc
osdc/Objecter.cc
+ common/compat.cc
common/Graylog.cc
common/fs_types.cc
common/dns_resolve.cc
${auth_files}
${mds_files})
+CHECK_C_COMPILER_FLAG("-fvar-tracking-assignments" HAS_VTA)
+if(HAS_VTA)
+ set_source_files_properties(
+ common/config.cc
+ common/options.cc
+ PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
+endif()
+
if(FREEBSD)
list(APPEND libcommon_files common/freebsd_errno.cc)
elseif(DARWIN)
mgr/DaemonState.cc
mgr/DaemonServer.cc
mgr/ClusterState.cc
- mgr/PyModules.cc
+ mgr/ActivePyModules.cc
+ mgr/OSDHealthMetricCollector.cc
+ mgr/StandbyPyModules.cc
+ mgr/PyModuleRegistry.cc
+ mgr/PyModuleRunner.cc
mgr/PyFormatter.cc
- mgr/PyState.cc
- mgr/MgrPyModule.cc
+ mgr/PyOSDMap.cc
+ mgr/BaseMgrModule.cc
+ mgr/BaseMgrStandbyModule.cc
+ mgr/ActivePyModule.cc
mgr/MgrStandby.cc
- mgr/Mgr.cc)
+ mgr/Mgr.cc
+ mgr/Gil.cc
+ mgr/mgr_commands.cc)
add_executable(ceph-mgr ${mgr_srcs}
$<TARGET_OBJECTS:heap_profiler_objs>)
target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
add_subdirectory(pybind)
add_subdirectory(ceph-disk)
+add_subdirectory(ceph-volume)
add_subdirectory(ceph-detect-init)
## dencoder
-CHECK_C_COMPILER_FLAG("-fvar-tracking-assignments" HAS_VTA)
if(HAS_VTA)
set_source_files_properties(test/encoding/ceph_dencoder.cc
PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
endif(WITH_CCACHE AND CCACHE_FOUND)
- # We really want to have the CRC32 calculation in RocksDB accelerated
- # with SSE 4.2. For details refer to rocksdb/util/crc32c.cc.
- if (HAVE_INTEL_SSE4_2)
- list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_CXX_FLAGS=${SIMD_COMPILE_FLAGS})
- else()
- list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_SSE42=OFF)
- endif()
+ list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_SNAPPY=${SNAPPY_FOUND})
+ list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_LZ4=${LZ4_FOUND})
+ list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_ZLIB=${ZLIB_FOUND})
+
+ # SSE 4.2 is enabled by default in rocksdb's crc32c. For details refer to
+ # rocksdb/util/crc32c.cc.
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR})
list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
-
- if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
- list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF)
- endif()
+ list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF)
# we use an external project and copy the sources to bin directory to ensure
# that object files are built outside of the source tree.
install(TARGETS cephfs DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(DIRECTORY
"${CMAKE_SOURCE_DIR}/src/include/cephfs"
- DESTINATION include)
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
set(ceph_syn_srcs
ceph_syn.cc
client/SyntheticClient.cc)