smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: simplify the version.rc.in vars

Browse source 
remove the special cmake define for msversion and make it once in the rc
remove duplicate version vars in the rc and use the singe one twice
This commit is contained in:
sithlord48 2025-01-10 08:47:53 -05:00 committed by Nick Bolton
parent 16396bdbaa
commit 3f3116da05
4 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -84,20 +84,22 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
endif() endif()
endif() endif()
set(DESKFLOW_VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}")
set(DESKFLOW_VERSION_MS_CSV "${DESKFLOW_VERSION_MAJOR},${DESKFLOW_VERSION_MINOR},${DESKFLOW_VERSION_PATCH},${DESKFLOW_VERSION_TWEAK}")
#Define our project #Define our project
project( project(
deskflow deskflow
VERSION ${DESKFLOW_VERSION} VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
DESCRIPTION "Mouse and keyboard sharing utility" DESCRIPTION "Mouse and keyboard sharing utility"
LANGUAGES C CXX) LANGUAGES C CXX)
#Used for embedded copyright on binaries, limited space. #Used for embedded copyright on binaries, limited space.
set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 Deskflow Devs") set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 Deskflow Devs")
#Unset the vars used in the project call
unset(DESKFLOW_VERSION_MAJOR)
unset(DESKFLOW_VERSION_MINOR)
unset(DESKFLOW_VERSION_PATCH)
unset(DESKFLOW_VERSION_TWEAK)
message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}") message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
# Set lib versions # Set lib versions

2
deploy/linux/arch/PKGBUILD.in
View file

@ -1,7 +1,7 @@
# Maintainer: Deskflow Developers # Maintainer: Deskflow Developers
pkgname=deskflow pkgname=deskflow
pkgver=@DESKFLOW_VERSION@ pkgver=@CMAKE_PROJECT_VERSION@
pkgrel=1 pkgrel=1
pkgdesc="Mouse and keyboard sharing utility" pkgdesc="Mouse and keyboard sharing utility"
url='https://deskflow.org' url='https://deskflow.org'

15
src/apps/res/version.rc.in
View file

@ -6,11 +6,8 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
#include <windows.h> #include <windows.h>
#include <verrsrc.h> #include <verrsrc.h>
#define VER_FILEVERSION @DESKFLOW_VERSION_MS_CSV@ #define VER_VERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
#define VER_FILEVERSION_STR "@DESKFLOW_VERSION_MS@\0" #define VER_VERSION_STR "@CMAKE_PROJECT_VERSION@\0"
#define VER_PRODUCTVERSION @DESKFLOW_VERSION_MS_CSV@
#define VER_PRODUCTVERSION_STR "@DESKFLOW_VERSION@\0"
#define VER_COMPANYNAME_STR "Deskflow\0" #define VER_COMPANYNAME_STR "Deskflow\0"
#define VER_FILEDESCRIPTION_STR "Deskflow\0" #define VER_FILEDESCRIPTION_STR "Deskflow\0"
@ -22,8 +19,8 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
#define VER_PRODUCTNAME_STR "Deskflow\0" #define VER_PRODUCTNAME_STR "Deskflow\0"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION FILEVERSION VER_VERSION
PRODUCTVERSION VER_PRODUCTVERSION PRODUCTVERSION VER_VERSION
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0 // No flags FILEFLAGS 0 // No flags
FILEOS VOS__WINDOWS32 FILEOS VOS__WINDOWS32
@ -36,14 +33,14 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", VER_COMPANYNAME_STR VALUE "CompanyName", VER_COMPANYNAME_STR
VALUE "FileDescription", VER_FILEDESCRIPTION_STR VALUE "FileDescription", VER_FILEDESCRIPTION_STR
VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileVersion", VER_VERSION_STR
VALUE "InternalName", VER_INTERNALNAME_STR VALUE "InternalName", VER_INTERNALNAME_STR
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
VALUE "ProductName", VER_PRODUCTNAME_STR VALUE "ProductName", VER_PRODUCTNAME_STR
VALUE "ProductVersion", VER_PRODUCTVERSION_STR VALUE "ProductVersion", VER_VERSION_STR
END END
END END

4
src/test/CMakeLists.txt
View file

@ -76,10 +76,6 @@ macro(set_sources)
list(APPEND sources ${headers}) list(APPEND sources ${headers})
endif() endif()
if(WIN32)
list(APPEND sources ${PROJECT_BINARY_DIR}/src/version.rc)
endif()
list(APPEND sources ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.qrc) list(APPEND sources ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.qrc)
replace_platform_sources() replace_platform_sources()