rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove duplicated install process between RPM spec and CMake

This commit is contained in:
Andrew Nelless 2017-04-27 12:26:01 +01:00
parent 10cabbc5a0
commit 032ca5cf30
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -387,6 +387,8 @@ message (STATUS "NOT configuring the v1 installer")
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
if("${VERSION_MAJOR}" STREQUAL "2")
install(FILES res/synergy2.desktop DESTINATION share/applications)
else()
@ -394,7 +396,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif()
install(FILES res/synergy.svg DESTINATION share/icons)
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
endif()
add_subdirectory (src)

13
dist/rpm/synergy.spec.in vendored
View File

@ -13,19 +13,6 @@ Release: 1
Synergy allows you to share one mouse and keyboard between multiple computers.
Work seamlessly across Windows, macOS and Linux.
%prep
mkdir -p %{buildroot}/%{_datarootdir}/applications
mkdir -p %{buildroot}/%{_datarootdir}/icons
mkdir -p %{buildroot}/%{_bindir}
cp %{bindir}/synergy %{buildroot}%{_bindir}
cp %{bindir}/synergyc %{buildroot}%{_bindir}
cp %{bindir}/synergys %{buildroot}%{_bindir}
cp %{bindir}/synergyd %{buildroot}%{_bindir}
cp %{bindir}/syntool %{buildroot}%{_bindir}
cp %{sourcedir}/res/synergy.desktop %{buildroot}%{_datarootdir}/applications
cp %{sourcedir}/res/synergy.svg %{buildroot}%{_datarootdir}/icons
%files
%defattr(755,root,root,-)
%{_bindir}/synergy