Improve compatibility with new CMake macro
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
7955c00992
commit
b192dfd781
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user