Skip to content
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

Jump to bottom

Fixes to build with bundled zlib #388

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes to build with bundled zlib #388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3b7b66
fix `'zconf.h' file not found`
peter23 Sep 12, 2024
b539e0a
zlib headers are required to build example binaries in zlib, so path …
peter23 Sep 12, 2024
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ if(UNIX OR MINGW)
include_directories(SYSTEM third_party/protobuf/src)
endif()
if(NOT ZLIB_FOUND)
add_subdirectory(third_party/zlib)
include_directories(SYSTEM third_party/zlib)
add_subdirectory(third_party/zlib)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib)
endif()
else()
if(BLOATY_ENABLE_RE2)
Expand All @@ -149,8 +150,8 @@ else()
add_subdirectory(third_party/protobuf/cmake)
include_directories(SYSTEM third_party/protobuf/src)

add_subdirectory(third_party/zlib)
include_directories(third_party/zlib)
add_subdirectory(third_party/zlib)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib)
set_property(TARGET example PROPERTY FOLDER "third_party")
set_property(TARGET minigzip PROPERTY FOLDER "third_party")
Expand Down
Loading