summaryrefslogtreecommitdiffstats
path: root/src/compressor
diff options
context:
space:
mode:
Diffstat (limited to 'src/compressor')
-rw-r--r--src/compressor/CMakeLists.txt21
-rw-r--r--src/compressor/brotli/CMakeLists.txt6
-rw-r--r--src/compressor/brotli/CompressionPluginBrotli.cc3
-rw-r--r--src/compressor/lz4/CMakeLists.txt5
-rw-r--r--src/compressor/lz4/CompressionPluginLZ4.cc4
-rw-r--r--src/compressor/snappy/CMakeLists.txt5
-rw-r--r--src/compressor/snappy/CompressionPluginSnappy.cc4
-rw-r--r--src/compressor/zlib/CMakeLists.txt6
-rw-r--r--src/compressor/zlib/CompressionPluginZlib.cc3
-rw-r--r--src/compressor/zstd/CMakeLists.txt5
-rw-r--r--src/compressor/zstd/CompressionPluginZstd.cc4
11 files changed, 0 insertions, 66 deletions
diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt
index 6a401679092..5182784288e 100644
--- a/src/compressor/CMakeLists.txt
+++ b/src/compressor/CMakeLists.txt
@@ -37,24 +37,3 @@ endif()
add_custom_target(compressor_plugins DEPENDS
${ceph_compressor_libs})
-
-if(WITH_EMBEDDED)
- include(MergeStaticLibraries)
- add_library(cephd_compressor_base STATIC ${compressor_srcs})
- if(HAVE_QATZIP)
- target_link_libraries(cephd_compressor_base ${QATZIP_LIBRARIES})
- endif()
- set_target_properties(cephd_compressor_base PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
- set(cephd_compressor_libs
- cephd_compressor_base
- cephd_compressor_snappy
- cephd_compressor_zlib
- cephd_compressor_zstd)
- if(HAVE_LZ4)
- list(APPEND cephd_compressor_libs cephd_compressor_lz4)
- endif()
- if(HAVE_BROTLI)
- list(APPEND cephd_compressor_libs cephd_compressor_brotli)
- endif()
- merge_static_libraries(cephd_compressor ${cephd_compressor_libs})
-endif()
diff --git a/src/compressor/brotli/CMakeLists.txt b/src/compressor/brotli/CMakeLists.txt
index 70be478044e..bbf90b1603e 100644
--- a/src/compressor/brotli/CMakeLists.txt
+++ b/src/compressor/brotli/CMakeLists.txt
@@ -35,9 +35,3 @@ target_include_directories(ceph_brotli PRIVATE "${CMAKE_BINARY_DIR}/src/brotli/c
List(REVERSE bortli_libs)
target_link_libraries(ceph_brotli ${BROTLI_LIBRARIES})
install(TARGETS ceph_brotli DESTINATION ${compressor_plugin_dir})
-
-if(WITH_EMBEDDED)
- add_library(cephd_compressor_brotli STATIC ${brotli_sources})
- target_include_directories(cephd_compressor_brotli PRIVATE "${CMAKE_BINARY_DIR}/src/brotli/c/include")
- set_target_properties(cephd_compressor_brotli PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
-endif()
diff --git a/src/compressor/brotli/CompressionPluginBrotli.cc b/src/compressor/brotli/CompressionPluginBrotli.cc
index 9b11209f3e7..0d85a442446 100644
--- a/src/compressor/brotli/CompressionPluginBrotli.cc
+++ b/src/compressor/brotli/CompressionPluginBrotli.cc
@@ -2,8 +2,6 @@
#include "ceph_ver.h"
#include "CompressionPluginBrotli.h"
-#ifndef BUILDING_FOR_EMBEDDED
-
const char *__ceph_plugin_version()
{
return CEPH_GIT_NICE_VER;
@@ -17,4 +15,3 @@ int __ceph_plugin_init(CephContext *cct,
return instance->add(type, name, new CompressionPluginBrotli(cct));
}
-#endif // !BUILDING_FOR_EMBEDDED
diff --git a/src/compressor/lz4/CMakeLists.txt b/src/compressor/lz4/CMakeLists.txt
index 921b4c573e2..11d8576fac2 100644
--- a/src/compressor/lz4/CMakeLists.txt
+++ b/src/compressor/lz4/CMakeLists.txt
@@ -11,8 +11,3 @@ set_target_properties(ceph_lz4 PROPERTIES
SOVERSION 2
INSTALL_RPATH "")
install(TARGETS ceph_lz4 DESTINATION ${compressor_plugin_dir})
-
-if(WITH_EMBEDDED)
- add_library(cephd_compressor_lz4 STATIC ${lz4_sources})
- set_target_properties(cephd_compressor_lz4 PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
-endif()
diff --git a/src/compressor/lz4/CompressionPluginLZ4.cc b/src/compressor/lz4/CompressionPluginLZ4.cc
index c99e5dcdc8d..99d018765ba 100644
--- a/src/compressor/lz4/CompressionPluginLZ4.cc
+++ b/src/compressor/lz4/CompressionPluginLZ4.cc
@@ -16,8 +16,6 @@
#include "ceph_ver.h"
#include "CompressionPluginLZ4.h"
-#ifndef BUILDING_FOR_EMBEDDED
-
// -----------------------------------------------------------------------------
const char *__ceph_plugin_version()
@@ -35,5 +33,3 @@ int __ceph_plugin_init(CephContext *cct,
return instance->add(type, name, new CompressionPluginLZ4(cct));
}
-
-#endif // !BUILDING_FOR_EMBEDDED
diff --git a/src/compressor/snappy/CMakeLists.txt b/src/compressor/snappy/CMakeLists.txt
index 139f62af5dd..7b38794c496 100644
--- a/src/compressor/snappy/CMakeLists.txt
+++ b/src/compressor/snappy/CMakeLists.txt
@@ -13,8 +13,3 @@ set_target_properties(ceph_snappy PROPERTIES
SOVERSION 2
INSTALL_RPATH "")
install(TARGETS ceph_snappy DESTINATION ${compressor_plugin_dir})
-
-if(WITH_EMBEDDED)
- add_library(cephd_compressor_snappy STATIC ${snappy_sources})
- set_target_properties(cephd_compressor_snappy PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
-endif()
diff --git a/src/compressor/snappy/CompressionPluginSnappy.cc b/src/compressor/snappy/CompressionPluginSnappy.cc
index 6d67c41c746..44d77ccbb6f 100644
--- a/src/compressor/snappy/CompressionPluginSnappy.cc
+++ b/src/compressor/snappy/CompressionPluginSnappy.cc
@@ -18,8 +18,6 @@
#include "ceph_ver.h"
#include "CompressionPluginSnappy.h"
-#ifndef BUILDING_FOR_EMBEDDED
-
// -----------------------------------------------------------------------------
const char *__ceph_plugin_version()
@@ -37,5 +35,3 @@ int __ceph_plugin_init(CephContext *cct,
return instance->add(type, name, new CompressionPluginSnappy(cct));
}
-
-#endif // !BUILDING_FOR_EMBEDDED
diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt
index 231129b872e..109fef521fc 100644
--- a/src/compressor/zlib/CMakeLists.txt
+++ b/src/compressor/zlib/CMakeLists.txt
@@ -45,9 +45,3 @@ set_target_properties(ceph_zlib PROPERTIES
SOVERSION 2
INSTALL_RPATH "")
install(TARGETS ceph_zlib DESTINATION ${compressor_plugin_dir})
-
-if(WITH_EMBEDDED)
- add_library(cephd_compressor_zlib STATIC ${zlib_sources})
- target_include_directories(cephd_compressor_zlib SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/isa-l/include")
- set_target_properties(cephd_compressor_zlib PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
-endif()
diff --git a/src/compressor/zlib/CompressionPluginZlib.cc b/src/compressor/zlib/CompressionPluginZlib.cc
index 26969f8377a..3602ea4a8f7 100644
--- a/src/compressor/zlib/CompressionPluginZlib.cc
+++ b/src/compressor/zlib/CompressionPluginZlib.cc
@@ -18,7 +18,6 @@
#include "ceph_ver.h"
#include "CompressionPluginZlib.h"
-#ifndef BUILDING_FOR_EMBEDDED
// -----------------------------------------------------------------------------
const char *__ceph_plugin_version()
@@ -36,5 +35,3 @@ int __ceph_plugin_init(CephContext *cct,
return instance->add(type, name, new CompressionPluginZlib(cct));
}
-
-#endif // !BUILDING_FOR_EMBEDDED
diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
index 5a80aa539c8..e30cb895aee 100644
--- a/src/compressor/zstd/CMakeLists.txt
+++ b/src/compressor/zstd/CMakeLists.txt
@@ -39,8 +39,3 @@ set_target_properties(ceph_zstd PROPERTIES
SOVERSION 2
INSTALL_RPATH "")
install(TARGETS ceph_zstd DESTINATION ${compressor_plugin_dir})
-
-if(WITH_EMBEDDED)
- add_library(cephd_compressor_zstd STATIC ${zstd_sources})
- set_target_properties(cephd_compressor_zstd PROPERTIES COMPILE_DEFINITIONS BUILDING_FOR_EMBEDDED)
-endif()
diff --git a/src/compressor/zstd/CompressionPluginZstd.cc b/src/compressor/zstd/CompressionPluginZstd.cc
index 321b3dd96f6..d9007b788a4 100644
--- a/src/compressor/zstd/CompressionPluginZstd.cc
+++ b/src/compressor/zstd/CompressionPluginZstd.cc
@@ -16,8 +16,6 @@
#include "ceph_ver.h"
#include "CompressionPluginZstd.h"
-#ifndef BUILDING_FOR_EMBEDDED
-
// -----------------------------------------------------------------------------
const char *__ceph_plugin_version()
@@ -35,5 +33,3 @@ int __ceph_plugin_init(CephContext *cct,
return instance->add(type, name, new CompressionPluginZstd(cct));
}
-
-#endif // !BUILDING_FOR_EMBEDDED
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 18:47:26 +0100