From 032ca5cf3031da8067838a04eec77cecf5fcc1d8 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Thu, 27 Apr 2017 12:26:01 +0100 Subject: [PATCH] Remove duplicated install process between RPM spec and CMake --- CMakeLists.txt | 3 ++- dist/rpm/synergy.spec.in | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b95aa9d..aee79732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in index 5251f408..969ecdf3 100644 --- a/dist/rpm/synergy.spec.in +++ b/dist/rpm/synergy.spec.in @@ -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