From 17e9132f737a87bcbb49312fc48da762800ef471 Mon Sep 17 00:00:00 2001 From: Jonas Karlsson Date: Wed, 9 Oct 2019 14:23:23 +0200 Subject: [irrlicht] do not build exisiting dependencies Since libjpeg, libpng, zlib and bzlib are provided as dependencies through vcpkg, we disable building them in irrlicht. This fixes a runtime error steming from a version mismatch between the libjpeg versions provided by irrlicht and vcpkg respectively --- ports/irrlicht/CMakeLists.txt | 8 ++++++++ ports/irrlicht/CONTROL | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index ef4439126..3eda8264a 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -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 # ------------------------------------------------------------------------------------------------- diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index d92222ec5..155b2f38b 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -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 -- cgit v1.2.3