From 7cb60c14ca74a5be62ee19eba47e909a1d5f2f066a0f001cb4662ad8870e3a30 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 4 Jun 2020 14:19:09 +0000 Subject: [PATCH] Accepting request 811375 from home:simotek:cmake:test - DCMAKE_MODULES_INSTALL_DIR should be %{_libdir}/cmake/%{name} - Set CMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} - Use -DCMAKE_SKIP_INSTALL_RPATHS:BOOL=ON instead of completely removing rpaths. boo#1172331 OBS-URL: https://build.opensuse.org/request/show/811375 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=414 --- cmake.changes | 8 ++++++++ cmake.macros | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 0e4d533..b12737f 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 1 08:22:45 UTC 2020 - Simon Lees + +- DCMAKE_MODULES_INSTALL_DIR should be %{_libdir}/cmake/%{name} +- Set CMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} +- Use -DCMAKE_SKIP_INSTALL_RPATHS:BOOL=ON instead of completely + removing rpaths. boo#1172331 + ------------------------------------------------------------------- Sat May 30 18:31:12 UTC 2020 - Andreas Stieger diff --git a/cmake.macros b/cmake.macros index bd8ec84..4501e31 100644 --- a/cmake.macros +++ b/cmake.macros @@ -24,6 +24,7 @@ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ + -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ @@ -35,14 +36,14 @@ -DLIB_SUFFIX=64 \\\ %endif \ %if %suse_version <= 1500 \ - -DCMAKE_SKIP_RPATH:BOOL=ON \\\ + -DCMAKE_SKIP_INSTALL_RPATHS:BOOL=ON \\\ %endif \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_STATIC_LIBS:BOOL=OFF \\\ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ - -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules + -DCMAKE_MODULES_INSTALL_DIR=%{_libdir}/cmake/%{name} %__builder_verbose \ %if "%__builder" == "%__make" \