From: Victor Westerhuis Date: Thu, 18 Mar 2021 11:21:56 +0000 (+0100) Subject: Fix GNUInstallDirs includedir detection X-Git-Tag: 2.0.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea19800c9dc4b7760b3864a535e2cd05bf39954;p=thirdparty%2Fzlib-ng.git Fix GNUInstallDirs includedir detection CMake uses `INCLUDEDIR` instead of `INCDIR`. --- diff --git a/cmake/detect-install-dirs.cmake b/cmake/detect-install-dirs.cmake index 421495479..ddf1adb8c 100644 --- a/cmake/detect-install-dirs.cmake +++ b/cmake/detect-install-dirs.cmake @@ -33,9 +33,9 @@ if (DEFINED INC_INSTALL_DIR) set(INC_INSTALL_DIR "${INC_INSTALL_DIR}" CACHE PATH "Installation directory for headers" FORCE) elseif (DEFINED INSTALL_INC_DIR) set(INC_INSTALL_DIR "${INSTALL_INC_DIR}" CACHE PATH "Installation directory for headers" FORCE) -elseif (DEFINED CMAKE_INSTALL_FULL_INCDIR) +elseif (DEFINED CMAKE_INSTALL_FULL_INCLUDEDIR) set(INC_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "Installation directory for headers" FORCE) -elseif (DEFINED CMAKE_INSTALL_INCDIR) +elseif (DEFINED CMAKE_INSTALL_INCLUDEDIR) set(INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers" FORCE) else() set(INC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")