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

bump version to 2.1. remove dependence on git for tarball builds.

This commit is contained in:
walker0643 2018-05-07 13:20:40 -04:00
parent 642eb33446
commit bd4c214c39
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/Version.cmake
View File

@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.4) cmake_minimum_required (VERSION 3.4)
set (BARRIER_VERSION_MAJOR 2) set (BARRIER_VERSION_MAJOR 2)
set (BARRIER_VERSION_MINOR 0) set (BARRIER_VERSION_MINOR 1)
set (BARRIER_VERSION_PATCH 0) set (BARRIER_VERSION_PATCH 0)
# #
@ -44,12 +44,18 @@ if (NOT DEFINED BARRIER_REVISION)
if (DEFINED ENV{GIT_COMMIT}) if (DEFINED ENV{GIT_COMMIT})
string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION) string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION)
else() else()
execute_process ( find_program (GIT_BINARY git)
COMMAND git rev-parse --short=8 HEAD if (GIT_BINARY STREQUAL "GIT_BINARY-NOTFOUND")
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} set (BARRIER_REVISION "00000000")
OUTPUT_VARIABLE BARRIER_REVISION message (WARNING "git not found. revision hash set to ${BARRIER_REVISION}")
OUTPUT_STRIP_TRAILING_WHITESPACE else()
) execute_process (
COMMAND git rev-parse --short=8 HEAD
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE BARRIER_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
endif() endif()
endif() endif()

11
res/barrier2.desktop
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Type=Application
Version=1.0
Name=Barrier
Comment=Keyboard and mouse sharing solution
Path=/usr/bin
Exec=/usr/bin/barrier2
Icon=barrier
Terminal=false
Categories=Utility;
Keywords=keyboard;mouse;sharing;network;share;