testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 811375 from home:simotek:cmake:test

Browse Source 
- 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
This commit is contained in:
Martin Pluskal 2020-06-04 14:19:09 +00:00 committed by Git OBS Bridge
parent d741d85656
commit 7cb60c14ca
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jun 1 08:22:45 UTC 2020 - Simon Lees <sflees@suse.de>
- 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 <andreas.stieger@gmx.de>

5
cmake.macros
View File

@ -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" \