Improve compatibility with new CMake macro
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
This commit is contained in:
parent
a4574bad7d
commit
4543f37e04
@ -1,3 +1,5 @@
|
||||
%undefine __cmake_in_source_build
|
||||
|
||||
Name: uchardet
|
||||
Version: 0.0.6
|
||||
Release: 10%{?dist}
|
||||
@ -28,25 +30,20 @@ for developing tools for uchardet.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
mkdir build
|
||||
|
||||
%build
|
||||
pushd build
|
||||
%cmake .. \
|
||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
||||
-DBUILD_STATIC=OFF
|
||||
%make_build
|
||||
popd
|
||||
%cmake \
|
||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
||||
-DBUILD_STATIC=OFF
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
pushd build
|
||||
%make_install
|
||||
popd
|
||||
%cmake_install
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%check
|
||||
pushd build
|
||||
pushd %{_vpath_builddir}
|
||||
ctest -VV \
|
||||
%ifarch %{ix86}
|
||||
|| :
|
||||
|
Loading…
Reference in New Issue
Block a user