From 9fa8fb752655f40428ccfea586c93fda320a44c39e4b729a7d5aa99378c2db9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 6 Nov 2013 12:55:12 +0000 Subject: [PATCH 1/2] Accepting request 205960 from home:bmanojlovic:branches:devel:tools:building - updated cmake.macros to include installation path for packages cmake modules OBS-URL: https://build.opensuse.org/request/show/205960 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=128 --- cmake.changes | 5 +++++ cmake.macros | 1 + 2 files changed, 6 insertions(+) diff --git a/cmake.changes b/cmake.changes index 1004ce5..228e3a2 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 6 12:42:56 UTC 2013 - boris@steki.net + +- updated cmake.macros to include installation path for cmake modules + ------------------------------------------------------------------- Tue Oct 8 16:35:02 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/cmake.macros b/cmake.macros index c58b5a0..30bdf2f 100644 --- a/cmake.macros +++ b/cmake.macros @@ -34,6 +34,7 @@ -DBUILD_STATIC_LIBS:BOOL=OFF \\\ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ + -DCMAKE_MODULES_INSTALL_DIR=/usr/share/cmake/Modules \\\ -DCMAKE_USER_MAKE_RULES_OVERRIDE="/usr/share/cmake/Modules/opensuse_rules.cmake" %cmake_install \ From 0d6b7b1b22492231997b76ab98c53e82f72647d654eb7bf460e8d758ea069a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 6 Nov 2013 18:29:08 +0000 Subject: [PATCH 2/2] Accepting request 205978 from home:bmanojlovic:branches:devel:tools:building After discussion with scarabeus, we have agreed to use %_datadir macro even if user change it (and possibly fail this macro) OBS-URL: https://build.opensuse.org/request/show/205978 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=129 --- cmake.macros | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.macros b/cmake.macros index 30bdf2f..60f0c3f 100644 --- a/cmake.macros +++ b/cmake.macros @@ -34,8 +34,8 @@ -DBUILD_STATIC_LIBS:BOOL=OFF \\\ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ - -DCMAKE_MODULES_INSTALL_DIR=/usr/share/cmake/Modules \\\ - -DCMAKE_USER_MAKE_RULES_OVERRIDE="/usr/share/cmake/Modules/opensuse_rules.cmake" + -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\ + -DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake" %cmake_install \ cd build \