Skip to content

Commit

Permalink
CMakeLists.txt: Respect FT_DISABLE_ZLIB value
Browse files Browse the repository at this point in the history
The CMake build uses `find_package` to look for dependencies. Before calling `find_package` it looks to see if the dependency was disabled. If not the associated `_FOUND` variable will be set. This value is then checked to determine if the dependency is added.

However `find_package(PNG)` calls `find_package(ZLIB)` within its find module. So in the case of `FT_DISABLE_ZLIB=TRUE` and `FT_DISABLE_PNG=FALSE` the `ZLIB_FOUND` value can be set and even though `FT_DISABLE_ZLIB` is turned on.

Unset the value of `ZLIB_FOUND` after the call to `find_package(PNG)` so the value is only set when `FT_DISABLE_ZLIB` is turned off.
  • Loading branch information
donny-dont committed Jun 29, 2024
1 parent bab9564 commit 2280346
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ if (NOT FT_DISABLE_PNG)
else ()
find_package(PNG)
endif ()
# FreePNG calls FindZLIB so unset ZLIB_FOUND to respect FT_DISABLE_ZLIB
unset(ZLIB_FOUND)
endif ()

if (NOT FT_DISABLE_ZLIB)
Expand Down

0 comments on commit 2280346

Please sign in to comment.