From 62a763183101290a212c5c4c783182390f736df0 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 28 Nov 2022 00:55:43 +0800 Subject: [PATCH] Add more GNUInstallDirs parameters --- cmake.spec | 5 ++++- macros.cmake | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 2184e90..9afd2d4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -22,7 +22,7 @@ Name: cmake Version: 3.25.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform make system License: BSD and MIT and zlib @@ -341,6 +341,9 @@ popd %endif %changelog +* Mon Nov 28 2022 Funda Wang - 3.25.0-3 +- Add more GNUInstallDirs parameters + * Wed Nov 23 2022 Funda Wang - 3.25.0-2 - Add GNUInstallDirs parameters as stated upstream https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html diff --git a/macros.cmake b/macros.cmake index 1716c30..81ef90a 100644 --- a/macros.cmake +++ b/macros.cmake @@ -35,9 +35,13 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ - -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ + -DCMAKE_INSTALL_FULL_LIBDIR:PATH=%{_libdir} \\\ + -DCMAKE_INSTALL_LIBEXECDIR:PATH=libexec \\\ + -DCMAKE_INSTALL_FULL_LIBEXECDIR:PATH=%{_libexecdir} \\\ -DCMAKE_INSTALL_RUNSTATEDIR:PATH=%{_rundir} \\\ + -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \\\ + -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \\\ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -- Gitee