Skip to content

using static zlib #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktarbet merged 2 commits into from
Nov 18, 2025
Merged

using static zlib #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e14af0
using static zlib
ktarbet Nov 17, 2025
aa44899
try zlibstatic for windows
ktarbet Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
"version": 10,
"version": 9,
"cmakeMinimumRequired": {
"major": 3,
"minor": 16,
"patch": 0
},
"$comment": "An example CMakePresets.json file",
"configurePresets": [
{
"name": "windows-default",
Expand Down
1 change: 0 additions & 1 deletion deps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/madler/zlib.git
GIT_TAG v1.3.1
)
set(ZLIB_BUILD_STATIC ON)
add_subdirectory(zlib)

FetchContent_Declare(
Expand Down
9 changes: 8 additions & 1 deletion heclib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
add_subdirectory(heclib_c)

add_library(heclib STATIC $<TARGET_OBJECTS:heclib_c>)
target_link_libraries(heclib PRIVATE ZLIB::ZLIBSTATIC)


if(MSVC)
target_link_libraries(heclib PRIVATE zlibstatic)
else()
target_link_libraries(heclib PRIVATE ZLIB::ZLIBSTATIC)
endif()

target_include_directories(heclib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/heclib_c/src/headers)

add_subdirectory(hecdss)
Expand Down
2 changes: 1 addition & 1 deletion heclib/javaHeclib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if(JNI_FOUND)
message(STATUS "generic options")
endif()
target_include_directories(javaHeclib PUBLIC src/headers ${JNI_INCLUDE_DIRS})
target_link_libraries(javaHeclib PRIVATE heclib ${JNI_LIBRARIES})
target_link_libraries(javaHeclib PRIVATE heclib)

target_sources(javaHeclib PRIVATE
src/Hec_zrecInfo.c
Expand Down