From 37903f8ed2933b3ce61b3609e89eb369b05004eb Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sat, 21 Jan 2023 09:57:44 -0500 Subject: [PATCH 1/2] Don't build zlib if ASSIMP_BUILD_ZLIB=OFF --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d20e6c9e0..e859986b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -482,7 +482,11 @@ ELSE() FIND_PACKAGE(ZLIB) ENDIF() - IF( NOT ZLIB_FOUND ) + IF ( NOT ZLIB_FOUND AND NOT ASSIMP_BUILD_ZLIB ) + message( FATAL_ERROR + "Build configured with -DASSIMP_BUILD_ZLIB=OFF but unable to find zlib" + ) + ELSEIF( NOT ZLIB_FOUND ) MESSAGE(STATUS "compiling zlib from sources") INCLUDE(CheckIncludeFile) INCLUDE(CheckTypeSize) From ffbeb2db186143ce85a05c024396093905706861 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Tue, 24 Jan 2023 19:21:54 -0500 Subject: [PATCH 2/2] CI --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 47914a3f2..f9d0d6c05 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -99,7 +99,7 @@ jobs: - name: Set Windows specific CMake arguments if: contains(matrix.name, 'windows') id: windows_extra_cmake_args - run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1" + run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1" - name: Set Hunter specific CMake arguments if: contains(matrix.name, 'hunter')