From 52e28df7e196c80d93b85e78cf9184b2345cd9ee Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sep 08 2019 02:33:00 +0000 Subject: [PATCH 1/3] Fix path to CMake macro files. --- diff --git a/guidelines/modules/ROOT/pages/CMake.adoc b/guidelines/modules/ROOT/pages/CMake.adoc index 275186a..3eef49e 100644 --- a/guidelines/modules/ROOT/pages/CMake.adoc +++ b/guidelines/modules/ROOT/pages/CMake.adoc @@ -4,9 +4,9 @@ This document provides CMake best-practices for generating Fedora RPMS using CMa == RPM Macros -If CMake is installed, see /usr/lib/rpm/macros.d/cmake or /etc/rpm/macros.cmake on EL6. +If CMake is installed, see `+/usr/lib/rpm/macros.d/macros.cmake+` or `+/etc/rpm/macros.cmake+` on EL6. -If kde-filesystem is installed, see /usr/lib/rpm/macros.d/macros.kde4 +If kde-filesystem is installed, see `+/usr/lib/rpm/macros.d/macros.kde4+` == Specfile Usage From 4e7543bbe5a40a473665aa60b5b568c35ae4c319 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sep 08 2019 02:34:02 +0000 Subject: [PATCH 2/3] Use updated https links to CMake docs. --- diff --git a/guidelines/modules/ROOT/pages/CMake.adoc b/guidelines/modules/ROOT/pages/CMake.adoc index 3eef49e..2f58a38 100644 --- a/guidelines/modules/ROOT/pages/CMake.adoc +++ b/guidelines/modules/ROOT/pages/CMake.adoc @@ -37,5 +37,5 @@ in this case `+INSTALL(TARGETS ...)+` must be used in combination with changing *NOTE*: CMake has good documentation in two places: -* http://www.cmake.org/documentation/ -* http://www.cmake.org/Wiki/CMake +* https://www.cmake.org/documentation/ +* https://gitlab.kitware.com/cmake/community/wikis/Home From b6c5c0758bcbb30d6ca908e1833a691e90e6d8ea Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sep 08 2019 03:14:32 +0000 Subject: [PATCH 3/3] Drop EL6 reference. --- diff --git a/guidelines/modules/ROOT/pages/CMake.adoc b/guidelines/modules/ROOT/pages/CMake.adoc index 2f58a38..b84a838 100644 --- a/guidelines/modules/ROOT/pages/CMake.adoc +++ b/guidelines/modules/ROOT/pages/CMake.adoc @@ -4,7 +4,7 @@ This document provides CMake best-practices for generating Fedora RPMS using CMa == RPM Macros -If CMake is installed, see `+/usr/lib/rpm/macros.d/macros.cmake+` or `+/etc/rpm/macros.cmake+` on EL6. +If CMake is installed, see `+/usr/lib/rpm/macros.d/macros.cmake+`. If kde-filesystem is installed, see `+/usr/lib/rpm/macros.d/macros.kde4+`