diff options
Diffstat (limited to '0003-remove-bc_compute_full_version-usage.patch')
| -rw-r--r-- | 0003-remove-bc_compute_full_version-usage.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/0003-remove-bc_compute_full_version-usage.patch b/0003-remove-bc_compute_full_version-usage.patch new file mode 100644 index 000000000000..2484c87a843d --- /dev/null +++ b/0003-remove-bc_compute_full_version-usage.patch @@ -0,0 +1,52 @@ +From 7cf21c4f00b4a77613f5922e00789e60ded77536 Mon Sep 17 00:00:00 2001 +From: David P <megver83@parabola.nu> +Date: Mon, 3 Aug 2020 12:51:55 -0400 +Subject: [PATCH 3/3] remove bc_compute_full_version usage + +--- + linphone-app/build/CMakeLists.txt | 5 ----- + .../cmake_builder/linphone_package/CMakeLists.txt | 12 +----------- + 2 files changed, 1 insertion(+), 16 deletions(-) + +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 9549b595..f8634e1b 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -38,17 +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)) +- set(APP_PROJECT_VERSION "0.0.0") +-endif () ++set(APP_PROJECT_VERSION "0.0.0") + string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") + string(REPLACE "." ";" SPLITTED_LINPHONE_VERSION "${LINPHONE_VERSION}") + list(LENGTH SPLITTED_LINPHONE_VERSION SPLITTED_LINPHONE_VERSION_LENGTH) +-- +2.28.0 + |