rpm/zxing-cpp
SHA256
1
0
Fork 0
forked from pool/zxing-cpp
Code Pull Requests Activity

Accepting request 929661 from home:dspinella:branches:devel:libraries:c_c++

Browse Source 
- Do not build examples to avoid a cycle with QT5Multimedia

Please forward the request to Factory if it gets accepted. Thank you.

OBS-URL: https://build.opensuse.org/request/show/929661
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=21
This commit is contained in:
Jan Engelhardt 2021-11-05 14:09:27 +00:00 committed by Git OBS Bridge
parent 9744d0b921
commit 7564acae07
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zxing-cpp.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 5 11:58:38 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Do not build examples to avoid a cycle with QT5Multimedia
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 3 14:42:33 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com> Wed Nov 3 14:42:33 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

7
zxing-cpp.spec
View File

@ -36,9 +36,6 @@ BuildRequires: gcc11-c++
%else %else
BuildRequires: cmake >= 3.10 BuildRequires: cmake >= 3.10
BuildRequires: gcc-c++ BuildRequires: gcc-c++
# For tests using the example app
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
%endif %endif
# only TW has fmt # only TW has fmt
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
@ -76,12 +73,12 @@ other applications.
%build %build
# Use g++-11 to build a C++17 codebase # Use g++-11 to build a C++17 codebase
# Examples require QT5 # Examples require QT5-base/multimedia, but doing so creates a cycle
# Blackbox tests require fmt # Blackbox tests require fmt
%cmake \ %cmake \
-DBUILD_EXAMPLES=OFF \
%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 %if !0%{?is_opensuse} && 0%{?sle_version} < 150000
-DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \ -DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \
-DBUILD_EXAMPLES=OFF \
%endif %endif
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
-DBUILD_BLACKBOX_TESTS=OFF \ -DBUILD_BLACKBOX_TESTS=OFF \