pool/cmake
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- reapply this change:

Browse Source 
* Fix setting CMAKE_INSTALL_LIBDIR in cmake macro
  * This is a relative path, see `cmake --help-module GNUInstallDirs`
  see also
  https://gitlab.kitware.com/cmake/cmake/-/issues/20250
  https://github.com/arvidn/libtorrent/issues/5125#issuecomment-691559244

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=427
This commit is contained in:
Dirk Mueller 2020-09-14 10:31:04 +00:00 committed by Git OBS Bridge
parent 7f1e19e4a7
commit cd1eb0f4c9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 14 10:29:33 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- reapply this change:
* Fix setting CMAKE_INSTALL_LIBDIR in cmake macro
* This is a relative path, see `cmake --help-module GNUInstallDirs`
see also
https://gitlab.kitware.com/cmake/cmake/-/issues/20250
https://github.com/arvidn/libtorrent/issues/5125#issuecomment-691559244
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 24 19:02:49 UTC 2020 - Dirk Mueller <dmueller@suse.com> Mon Aug 24 19:02:49 UTC 2020 - Dirk Mueller <dmueller@suse.com>

2
cmake.macros
View File

@ -23,7 +23,7 @@
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\
-DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\
-DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
-DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\