From 39b578c0fae56b307d90f1cdb622b17c224aa8016b99e5928dd2dfc5bc423490 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Wed, 5 Feb 2020 11:59:05 +0000 Subject: [PATCH] Accepting request 764183 from home:gladiac:branches:devel:tools:building - Fix setting CMAKE_INSTALL_LIBDIR in cmake macro * This is a relative path, see `cmake --help-module GNUInstallDirs` - Do NOT set -DCMAKE_SKIP_RPATH:BOOL=OFF * A lot of applications have private libraries in a subdirectory and require linking with RPATH which is totally valid. OBS-URL: https://build.opensuse.org/request/show/764183 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=394 --- cmake.changes | 9 +++++++++ cmake.macros | 3 +-- cmake.spec | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake.changes b/cmake.changes index 71425d9..c5d371f 100644 --- a/cmake.changes +++ b/cmake.changes @@ -3,6 +3,15 @@ Tue Jan 14 23:14:08 UTC 2020 - Christoph Junghans - use cmake generics in marcos.cmake +------------------------------------------------------------------- +Tue Jan 14 07:36:33 UTC 2020 - Andreas Schneider + +- Fix setting CMAKE_INSTALL_LIBDIR in cmake macro + * This is a relative path, see `cmake --help-module GNUInstallDirs` +- Do NOT set -DCMAKE_SKIP_RPATH:BOOL=OFF + * A lot of applications have private libraries in a subdirectory + and require linking with RPATH which is totally valid. + ------------------------------------------------------------------- Fri Dec 20 10:09:57 UTC 2019 - Christoph G diff --git a/cmake.macros b/cmake.macros index 562c110..81772e4 100644 --- a/cmake.macros +++ b/cmake.macros @@ -31,7 +31,7 @@ BuildRequires: ninja \ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ @@ -42,7 +42,6 @@ BuildRequires: ninja \ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \ - -DCMAKE_SKIP_RPATH:BOOL=ON \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_STATIC_LIBS:BOOL=OFF \\\ diff --git a/cmake.spec b/cmake.spec index a3430e8..41167bd 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # # spec file for package cmake # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed