Commit 4766525b authored by jehan's avatar jehan

improve cmake list for better rpm packaging

parent 9cb2c3ea
......@@ -59,7 +59,7 @@ develop programs using the mediastreamer2 library.
%setup -n %{name}-%{version}-%build_number
%build
%{expand:%%%cmake_name} . -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} -DCMAKE_PREFIX_PATH:PATH=%{_prefix} -DENABLE_VIDEO=%{video}
%{expand:%%%cmake_name} . -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} -DCMAKE_PREFIX_PATH:PATH=%{_prefix} -DENABLE_VIDEO=%{video} -DENABLE_TESTS=no
make %{?_smp_mflags}
%install
......@@ -80,7 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog COPYING NEWS README.md
%{_bindir}/*
%{_libdir}/*.so.*
%if %{video}
%{_datadir}/images/nowebcamCIF.jpg
%endif
%files devel
%defattr(-,root,root,-)
......@@ -92,8 +94,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/Mediastreamer2/cmake/Mediastreamer2ConfigVersion.cmake
%{_datadir}/Mediastreamer2/cmake/Mediastreamer2Targets-noconfig.cmake
%{_datadir}/Mediastreamer2/cmake/Mediastreamer2Targets.cmake
%{_datadir}/mediastreamer2_tester/*
%{_bindir}/*
%{_docdir}
%changelog
......
......@@ -88,6 +88,9 @@ if (NOT IOS)
if(LINK_FLAGS_STR)
set_target_properties(mediastream PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
endif()
install(TARGETS mediastream
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
endif()
if(ENABLE_VIDEO)
......@@ -100,7 +103,7 @@ if(ENABLE_VIDEO)
endif()
if (NOT IOS)
install(TARGETS mediastream mkvstream
install(TARGETS mkvstream
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment