bafc9b9ff8
Co-authored-by: Thibault Lemaire <thibault.lemaire@protonmail.com> Co-authored-by: Austin Butler <abutler@riotgames.com>
75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001
|
|
From: David P <megver83@parabola.nu>
|
|
Date: Fri, 23 Oct 2020 16:44:17 -0300
|
|
Subject: [PATCH] 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 de7f917f..ee14ff78 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 ac85c68a..e6af5a66 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 ()
|
|
string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
|
|
--
|
|
2.25.1
|
|
|