From d33753251f882c39024bee5cbef776f6945876e900594c7d786f58265ce9cbbd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 13 Nov 2015 09:24:59 +0000 Subject: [PATCH] - Revert removal of CMAKE_INSTALL_LIBDIR declaration from the macros. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=231 --- cmake.changes | 6 ++++++ cmake.macros | 1 + 2 files changed, 7 insertions(+) diff --git a/cmake.changes b/cmake.changes index ae4c201..e610e0a 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 13 09:24:08 UTC 2015 - mpluskal@suse.com + +- Revert removal of CMAKE_INSTALL_LIBDIR declaration from the + macros. + ------------------------------------------------------------------- Thu Nov 12 21:43:23 UTC 2015 - foss@grueninger.de diff --git a/cmake.macros b/cmake.macros index 01911cd..19de682 100644 --- a/cmake.macros +++ b/cmake.macros @@ -15,6 +15,7 @@ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ -DCMAKE_BUILD_TYPE=None \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\