Merge pull request #8535 from karjonas/irrlicht_deps

[irrlicht] do not build exisiting dependencies
This commit is contained in:
Victor Romero 2019-10-09 13:57:04 -07:00 committed by GitHub
commit f3caee1cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View File

@ -137,6 +137,14 @@ if(NOT ${IRR_SHARED_LIB})
target_compile_definitions(Irrlicht PUBLIC _IRR_STATIC_LIB_)
endif()
# Disable Irrlicht building already provided dependencies
target_compile_definitions(Irrlicht
PRIVATE NO_IRR_USE_NON_SYSTEM_ZLIB_
PRIVATE NO_IRR_USE_NON_SYSTEM_LIB_PNG_
PRIVATE NO_IRR_USE_NON_SYSTEM_BZLIB_
PRIVATE NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
)
# Per platform config
# -------------------------------------------------------------------------------------------------

View File

@ -1,5 +1,5 @@
Source: irrlicht
Version: 1.8.4-3
Version: 1.8.4-4
Homepage: http://irrlicht.sourceforge.net
Description: Irrlicht lightning fast 3d engine
Build-Depends: zlib, libpng, bzip2, libjpeg-turbo