From: Harmen Stoppels Date: Tue, 2 May 2023 08:36:16 +0000 (+0200) Subject: Include GNUInstallDirs earlier X-Git-Tag: 2.1.1-beta2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf985ade30906b63bdc9c382a78b435498f743e3;p=thirdparty%2Fzlib-ng.git Include GNUInstallDirs earlier for pkg config dir --- diff --git a/cmake/detect-install-dirs.cmake b/cmake/detect-install-dirs.cmake index d2225f327..a7c774f47 100644 --- a/cmake/detect-install-dirs.cmake +++ b/cmake/detect-install-dirs.cmake @@ -26,6 +26,9 @@ elseif (DEFINED INSTALL_INC_DIR) set(CMAKE_INSTALL_INCLUDEDIR "${INSTALL_INC_DIR}") endif() +# Define GNU standard installation directories +include(GNUInstallDirs) + # Determine installation directory for pkgconfig files if (DEFINED PKGCONFIG_INSTALL_DIR) set(PKGCONFIG_INSTALL_DIR "${PKGCONFIG_INSTALL_DIR}" CACHE PATH "Installation directory for pkgconfig (.pc) files" FORCE) @@ -38,6 +41,3 @@ elseif (DEFINED CMAKE_INSTALL_FULL_PKGCONFIGDIR) else() set(PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") endif() - -# Define GNU standard installation directories -include(GNUInstallDirs)