Skip to content

Commit b6ddda3

Browse files
authored
using static zlib (#340)
* using static zlib adjust version in CmakePresets for Visual Studio * try zlibstatic for windows
1 parent 7536353 commit b6ddda3

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

CMakePresets.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"version": 10,
2+
"version": 9,
33
"cmakeMinimumRequired": {
44
"major": 3,
55
"minor": 16,
66
"patch": 0
77
},
8-
"$comment": "An example CMakePresets.json file",
98
"configurePresets": [
109
{
1110
"name": "windows-default",

deps/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FetchContent_Declare(
55
GIT_REPOSITORY https://github.com/madler/zlib.git
66
GIT_TAG v1.3.1
77
)
8-
set(ZLIB_BUILD_STATIC ON)
98
add_subdirectory(zlib)
109

1110
FetchContent_Declare(

heclib/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
add_subdirectory(heclib_c)
33

44
add_library(heclib STATIC $<TARGET_OBJECTS:heclib_c>)
5-
target_link_libraries(heclib PRIVATE ZLIB::ZLIBSTATIC)
5+
6+
7+
if(MSVC)
8+
target_link_libraries(heclib PRIVATE zlibstatic)
9+
else()
10+
target_link_libraries(heclib PRIVATE ZLIB::ZLIBSTATIC)
11+
endif()
12+
613
target_include_directories(heclib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/heclib_c/src/headers)
714

815
add_subdirectory(hecdss)

heclib/javaHeclib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if(JNI_FOUND)
1111
message(STATUS "generic options")
1212
endif()
1313
target_include_directories(javaHeclib PUBLIC src/headers ${JNI_INCLUDE_DIRS})
14-
target_link_libraries(javaHeclib PRIVATE heclib ${JNI_LIBRARIES})
14+
target_link_libraries(javaHeclib PRIVATE heclib)
1515

1616
target_sources(javaHeclib PRIVATE
1717
src/Hec_zrecInfo.c

0 commit comments

Comments
 (0)