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

Suppress numerous libz warnings #6709

Merged
merged 2 commits into from
Apr 4, 2023
Merged

Suppress numerous libz warnings #6709

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
3707461
Suppress numerous libz warnings
romainguy Apr 4, 2023
0797d65
Fix Windows build
romainguy Apr 4, 2023
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
1 change: 1 addition & 0 deletions third_party/libassimp/tnt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ if(NOT MSVC)
PRIVATE -Wno-unused-const-variable
PRIVATE -Wno-unused-private-field
PRIVATE -Wno-unused-variable
PRIVATE -Wno-deprecated-non-prototype # See https://github.com/madler/zlib/issues/633
)
else()
target_compile_options(${TARGET} PRIVATE /bigobj)
Expand Down
13 changes: 7 additions & 6 deletions third_party/libz/tnt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,17 @@ set(SRCS
${SRC_DIR}/zutil.c
)

# we're building a library
add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})

if (NOT MSVC)
add_definitions(
-Wno-implicit-function-declaration
-Wno-shift-negative-value
target_compile_options(${TARGET}
PRIVATE -Wno-implicit-function-declaration
PRIVATE -Wno-shift-negative-value
PRIVATE -Wno-deprecated-non-prototype # See https://github.com/madler/zlib/issues/633
)
endif()

# we're building a library
add_library(${TARGET} STATIC ${PRIVATE_HDRS} ${PUBLIC_HDRS} ${SRCS})

# specify where the public headers of this library are
target_include_directories (${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
set_target_properties(${TARGET} PROPERTIES FOLDER ThirdParty)