Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: use EXCLUDE_FROM_ALL when declaring Fetch for deflate library #1880

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

CMake: use EXCLUDE_FROM_ALL when declaring Fetch for deflate library #1880

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb5e118
CMake: use lower case name when checking whether Deflate is populated
mattyjams Oct 12, 2024
0b6a06d
CMake: use EXCLUDE_FROM_ALL when declaring Fetch for deflate library
mattyjams Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions cmake/OpenEXRSetup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,37 @@ else()
message(STATUS "libdeflate was not found, installing from ${OPENEXR_DEFLATE_REPO} (${OPENEXR_DEFLATE_TAG})")
endif()
include(FetchContent)
# Fetch deflate but exclude it from the "all" target.
# This prevents the library from being built.
FetchContent_Declare(Deflate
GIT_REPOSITORY "${OPENEXR_DEFLATE_REPO}"
GIT_TAG "${OPENEXR_DEFLATE_TAG}"
GIT_SHALLOW ON
EXCLUDE_FROM_ALL
)

FetchContent_GetProperties(Deflate)
if(NOT Deflate_POPULATED)
FetchContent_MakeAvailable(Deflate)
if(NOT deflate_POPULATED)
if(CMAKE_VERSION VERSION_LESS "3.30")
# CMake 3.30 deprecated this single argument version of
# FetchContent_Populate():
# https://cmake.org/cmake/help/latest/policy/CMP0169.html
# Prior to CMake 3.28, passing the EXCLUDE_FROM_ALL option to
# FetchContent_Declare() does *not* have the desired effect of
# excluding the fetched content from the build when
# FetchContent_MakeAvailable() is called.
# Ideally we could "manually" set the EXCLUDE_FROM_ALL property on the
# deflate SOURCE_DIR and BINARY_DIR, but a bug that was only fixed as of
# CMake 3.20.3 prevents that from properly excluding the directories:
# https://gitlab.kitware.com/cmake/cmake/-/issues/22234
# To support the full range of CMake versions without overly
# complicating the logic here with workarounds, we continue to use
# Populate for CMake versions before 3.30, and switch to MakeAvailable
# for CMake 3.30 and later.
FetchContent_Populate(Deflate)
else()
FetchContent_MakeAvailable(Deflate)
endif()
endif()

# Rather than actually compile something, just embed the sources
Expand Down