Skip to content

Fix zlib #108

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

Open
Super-Genius wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Fix zlib #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
760ec0d
getting zlib to build for find_package and to be used by Boost when n…
Super-Genius Apr 4, 2026
2b44e6f
Updated libp2p
EduMenges Mar 30, 2026
076c53a
Added Windows version definition
EduMenges Apr 1, 2026
42b212d
Windows fixes
EduMenges Apr 1, 2026
3fb5a87
forgot to remove --without-python from the other OS's
Super-Genius Apr 4, 2026
908008a
Moves cached CMAKE arguments before the inclusion of zlib
Super-Genius Apr 4, 2026
d153c58
Backtrack MNN reference to unupdated local changes
Super-Genius Apr 4, 2026
bf819b7
Zlib fixes
itsafuu Apr 6, 2026
1a79fcd
Forked zlib and changes to config cmake for static only builds
itsafuu Apr 6, 2026
1f684c1
Put compiler options back in original spot
itsafuu Apr 6, 2026
c0d192a
change to alias for zlib, added passthrough to several projects that …
itsafuu Apr 6, 2026
0daa3fb
Don't pass zlib args for cross compile to protobuf plugin
itsafuu Apr 6, 2026
94ecdee
OSX is not technically cross compiling in the same way as others, so …
itsafuu Apr 7, 2026
51496e6
sqlite also requires zlib
itsafuu Apr 7, 2026
03cfaf5
Prefer config for non-cross compiled
itsafuu Apr 7, 2026
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
url = ../MNN.git
[submodule "zlib"]
path = zlib
url = https://github.com/madler/zlib.git
url = ../zlib.git
ignore = dirty
[submodule "libssh2"]
path = libssh2
Expand Down
33 changes: 25 additions & 8 deletions build/CommonCompilerOptions.CMake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@ if(NOT DEFINED CMAKE_COLOR_DIAGNOSTICS)
set(CMAKE_COLOR_DIAGNOSTICS ON)
endif()

if (DEFINED SANITIZE_CODE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${SANITIZE_CODE}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${SANITIZE_CODE}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${SANITIZE_CODE}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=${SANITIZE_CODE}")
add_compile_options("-fsanitize=${SANITIZE_CODE}")
add_link_options("-fsanitize=${SANITIZE_CODE}")
if (DEFINED SANITIZE_CODE)
message(STATUS "Building with sanitizer: ${SANITIZE_CODE}")
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${SANITIZE_CODE}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${SANITIZE_CODE}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${SANITIZE_CODE}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=${SANITIZE_CODE}")
add_compile_options("-fsanitize=${SANITIZE_CODE}")
add_link_options("-fsanitize=${SANITIZE_CODE}")
elseif (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=${SANITIZE_CODE}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=${SANITIZE_CODE}")
add_compile_options("/fsanitize=${SANITIZE_CODE}")
endif()
endif()

# Remove this once we update gRPC, its dependencies, fix libp2p and change some of our internal projects
Expand Down Expand Up @@ -53,17 +60,22 @@ else()
set(TP_BUILD_SUBDIR ${CMAKE_SYSTEM_NAME})
endif()

if(WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=0x0A00 -DNOMINMAX")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0A00 -DNOMINMAX")
endif()

if(MSVC)
set(_MSVC_RUNTIME_LIBRARY
-DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW
-DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$<CONFIG:Debug>:Debug>
)
endif()

string(STRIP "${CMAKE_C_FLAGS}" CMAKE_C_FLAGS)
string(STRIP "${CMAKE_CXX_FLAGS}" CMAKE_CXX_FLAGS)

set(_CMAKE_COMMON_CACHE_ARGS
-D_WIN32_WINNT:STRING=_WIN32_WINNT_WIN10
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_SHARED_LIBS:BOOL=OFF
-DBUILD_STATIC_LIBS:BOOL=ON
Expand Down Expand Up @@ -105,4 +117,9 @@ list(TRANSFORM BOOST_B2_FLAGS PREPEND "cxxflags=")
set(OPENSSL_VARIANT $<IF:$<CONFIG:Debug>,--debug,--release>)

option(MNN_BUILD_TESTS "Build MNN tests" OFF)
option(MNN_SUPPORT_TRANSFORMER_FUSE "Enable MNN transformer fuse ops for OSX external build" ON)
if (MNN_BUILD_TESTS)
set(MNN_TEST_BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib/run_test.out")
endif()


Loading
Loading