Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:kimi:telephony-to-merge
linphone-desktop
0002-remove-bc_compute_full_version-usage.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-remove-bc_compute_full_version-usage.patch of Package linphone-desktop
From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001 From: David P <megver83@parabola.nu> Date: Fri, 23 Oct 2020 16:44:17 -0300 Subject: [PATCH 2/2] remove bc_compute_full_version usage --- linphone-app/CMakeLists.txt | 11 +---------- linphone-app/build/CMakeLists.txt | 5 ----- .../cmake_builder/linphone_package/CMakeLists.txt | 10 +--------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt index 3bc9420a..27b418ee 100644 --- a/linphone-app/CMakeLists.txt +++ b/linphone-app/CMakeLists.txt @@ -21,17 +21,8 @@ ################################################################################ cmake_minimum_required(VERSION 3.1) +include(linphoneqt_version.cmake) find_package(bctoolbox CONFIG) -set(FULL_VERSION ) -bc_compute_full_version(FULL_VERSION) -set(version_major ) -set(version_minor ) -set(version_patch ) -set(identifiers ) -set(metadata ) -bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) - -project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") if(ENABLE_BUILD_VERBOSE) diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt index 8ef03faa..97d94bd6 100644 --- a/linphone-app/build/CMakeLists.txt +++ b/linphone-app/build/CMakeLists.txt @@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES "libmng.spec" ) -bc_compute_full_version(PROJECT_VERSION_BUILD) -if(PROJECT_VERSION_BUILD) - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}") -endif() - message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt index baea03cf..08ffc1b5 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") # ============================================================================== # Build package version. # ============================================================================== -bc_compute_full_version(APP_PROJECT_VERSION) -if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION)) - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always - OUTPUT_VARIABLE APP_PROJECT_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." - ) -elseif (NOT(APP_PROJECT_VERSION)) +if (NOT(APP_PROJECT_VERSION)) set(APP_PROJECT_VERSION "0.0.0") endif () -- 2.29.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor