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

Accepting request 764183 from home:gladiac:branches:devel:tools:building

Browse Source 
- 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
This commit is contained in:
Simon Lees 2020-02-05 11:59:05 +00:00 committed by Git OBS Bridge
parent dd41aea1b6
commit 39b578c0fa
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake.changes
View File

@ -3,6 +3,15 @@ Tue Jan 14 23:14:08 UTC 2020 - Christoph Junghans <junghans@votca.org>
- use cmake generics in marcos.cmake
-------------------------------------------------------------------
Tue Jan 14 07:36:33 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
- 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 <foss@grueninger.de>

3
cmake.macros
View File

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

2
cmake.spec
View File

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