Improve compatibility with new CMake macro

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Raits 2020-07-20 12:12:33 +02:00
parent 7955c00992
commit b192dfd781
No known key found for this signature in database
GPG Key ID: 115D5AB89C5C1E1E

View File

@ -1,3 +1,5 @@
%undefine __cmake_in_source_build
################################################################################
Name: dogtag-pki
################################################################################
@ -814,8 +816,6 @@ else
app_server=tomcat-$tomcat_version
fi
%{__mkdir_p} build
cd build
%cmake \
--no-warn-unused-cli \
-DVERSION=%{version}-%{release} \
@ -837,10 +837,10 @@ cd build
-DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \
-DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \
-DTHEME=%{?with_theme:%{brand}} \
..
%{nil}
# Do not use _smp_mflags to preserve build order
%{__make} \
make -C %{_vpath_builddir} \
VERBOSE=%{?_verbose} \
CMAKE_NO_VERBOSE=1 \
DESTDIR=%{buildroot} \
@ -852,9 +852,7 @@ cd build
%install
################################################################################
cd build
%{__make} \
make -C %{_vpath_builddir} \
VERBOSE=%{?_verbose} \
CMAKE_NO_VERBOSE=1 \
DESTDIR=%{buildroot} \
@ -863,7 +861,7 @@ cd build
install
%if %{with_test}
ctest --output-on-failure
%ctest
%endif
%if %{with meta}