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
|
Name: uchardet
|
||||||
Version: 0.0.6
|
Version: 0.0.6
|
||||||
Release: 10%{?dist}
|
Release: 10%{?dist}
|
||||||
@ -28,25 +30,20 @@ for developing tools for uchardet.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup
|
%autosetup
|
||||||
mkdir build
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
pushd build
|
%cmake \
|
||||||
%cmake .. \
|
|
||||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
||||||
-DBUILD_STATIC=OFF
|
-DBUILD_STATIC=OFF
|
||||||
%make_build
|
%cmake_build
|
||||||
popd
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd build
|
%cmake_install
|
||||||
%make_install
|
|
||||||
popd
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%check
|
%check
|
||||||
pushd build
|
pushd %{_vpath_builddir}
|
||||||
ctest -VV \
|
ctest -VV \
|
||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
|| :
|
|| :
|
||||||
|
Loading…
Reference in New Issue
Block a user