Skip to content

Commit 240e543

Browse files
authored
Merge pull request #1223 from a-detiste/master
enable using distro's libdeflate
2 parents 7c99b77 + 1106fd6 commit 240e543

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

CMakeLists.txt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
cmake_minimum_required(VERSION 3.26...3.29)
22
project(${SKBUILD_PROJECT_NAME} LANGUAGES C VERSION ${SKBUILD_PROJECT_VERSION})
33

4+
option(WITH_SYSTEM_DEFLATE "Use system provided deflate library" OFF)
5+
46
find_package(
57
Python
68
REQUIRED
@@ -11,16 +13,20 @@ find_package(
1113
NumPy
1214
)
1315

14-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
15-
set(LIBDEFLATE_COMPRESSION_SUPPORT OFF)
16-
set(LIBDEFLATE_GZIP_SUPPORT OFF)
17-
set(LIBDEFLATE_BUILD_GZIP OFF)
16+
python_add_library(cutils MODULE WITH_SOABI USE_SABI 3.10 src/asammdf/blocks/cutils.c)
1817

18+
if (WITH_SYSTEM_DEFLATE)
19+
find_package(libdeflate REQUIRED)
20+
target_link_libraries(cutils PRIVATE Python::NumPy libdeflate::libdeflate_shared)
21+
else()
1922
# Add submodule libdeflate
20-
add_subdirectory(ext/libdeflate EXCLUDE_FROM_ALL)
21-
22-
python_add_library(cutils MODULE WITH_SOABI USE_SABI 3.10 src/asammdf/blocks/cutils.c)
23+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
24+
set(LIBDEFLATE_COMPRESSION_SUPPORT OFF)
25+
set(LIBDEFLATE_GZIP_SUPPORT OFF)
26+
set(LIBDEFLATE_BUILD_GZIP OFF)
27+
add_subdirectory(ext/libdeflate EXCLUDE_FROM_ALL)
28+
target_link_libraries(cutils PRIVATE Python::NumPy libdeflate::libdeflate_static)
29+
endif()
2330

24-
target_link_libraries(cutils PRIVATE Python::NumPy libdeflate::libdeflate_static)
2531

2632
install(TARGETS cutils DESTINATION "asammdf/blocks")

src/asammdf/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""asammdf version module"""
22

3-
__version__ = "8.5.0.dev1"
3+
__version__ = "8.5.0"

0 commit comments

Comments
 (0)