From ce41ecb3230a564fb877e95e04ff66c5ed5a83e9 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 20 Nov 2022 15:19:37 +0000 Subject: [PATCH] CMake: Fixup BZip2 dependency 1. Remove `find_package(BZip2 REQUIRED)` from Dependencies.cmake because it is not used by devilutionx directly (it's a libmpq dependency). 2. For emscripten, use the built-in version of bzip2. 3. Reverts 0b4705cf1c82db27f0da6a883b176b3ad813e112, which added a redundant `find_package(ZLIB REQUIRED)` to `Dependencies.cmake`. --- CMake/Dependencies.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index 0a9f9f445..04d023ca7 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -7,18 +7,18 @@ if(EMSCRIPTEN) emscripten_system_library("zlib" ZLIB::ZLIB USE_ZLIB=1) else() dependency_options("zlib" DEVILUTIONX_SYSTEM_ZLIB ON DEVILUTIONX_STATIC_ZLIB) - if(DEVILUTIONX_SYSTEM_ZLIB) - find_package(ZLIB REQUIRED) - else() + if(NOT DEVILUTIONX_SYSTEM_ZLIB) add_subdirectory(3rdParty/zlib) endif() endif() -dependency_options("bzip2" DEVILUTIONX_SYSTEM_BZIP2 ON DEVILUTIONX_STATIC_BZIP2) -if(DEVILUTIONX_SYSTEM_BZIP2) - find_package(BZip2 REQUIRED) +if(EMSCRIPTEN) + emscripten_system_library("bzip2" BZip2::BZip2 USE_BZIP2=1) else() - add_subdirectory(3rdParty/bzip2) + dependency_options("bzip2" DEVILUTIONX_SYSTEM_BZIP2 ON DEVILUTIONX_STATIC_BZIP2) + if(NOT DEVILUTIONX_SYSTEM_BZIP2) + add_subdirectory(3rdParty/bzip2) + endif() endif() if(EMSCRIPTEN)