commit ab8d26c8a275f605a2d03d703888578aad95cee1
author Marcin Serwin <marcin@serwin.dev> Sat Jul 19 16:45:57 2025 +0200
committer Wan-Teh Chang <wtc@google.com> Mon Jul 21 18:25:53 2025 -0700
tree 67f21ad6f6e0367f80bb3d49a9b5b273fceb2b93
parent a4fec908b582fd7b82c86014a68e54dc5e0f4058

Don't hardcode 'include' as includedir

GNUInstallDirs defines CMAKE_INSTALL_INCLUDEDIR as a location
to install headers. This is important for distributions that
want to install development files under a different prefix, see
https://github.com/NixOS/nixpkgs/pull/424658.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 558761e..859860f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@
 include(FetchContent)
 include(FindPkgConfig)
 include(AvifExternalProjectUtils)
+include(GNUInstallDirs)
 
 option(AVIF_ENABLE_NODISCARD "Add [[nodiscard]] to some functions. CMake must be at least 3.21 to force C23." OFF)
 
@@ -591,7 +592,9 @@
 # Main avif library.
 set_target_properties(avif PROPERTIES VERSION ${LIBRARY_VERSION} SOVERSION ${LIBRARY_SOVERSION})
 target_link_libraries(avif PRIVATE avif_obj)
-target_include_directories(avif PUBLIC $<BUILD_INTERFACE:${libavif_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+target_include_directories(
+    avif PUBLIC $<BUILD_INTERFACE:${libavif_SOURCE_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
 if(BUILD_SHARED_LIBS)
     target_compile_definitions(avif INTERFACE AVIF_DLL)
     if(AVIF_LIB_USE_CXX)
@@ -636,10 +639,6 @@
     set(SKIP_INSTALL_ALL TRUE)
 endif()
 
-if(NOT SKIP_INSTALL_ALL)
-    include(GNUInstallDirs)
-endif()
-
 if(AVIF_BUILD_APPS OR (AVIF_BUILD_TESTS AND (AVIF_FUZZTEST OR AVIF_GTEST)))
     if(AVIF_ZLIBPNG STREQUAL "OFF")
         message(FATAL_ERROR "libavif: AVIF_ZLIBPNG cannot be OFF when AVIF_BUILD_APPS or AVIF_BUILD_TESTS is ON")