File linphoneqt-02-remove-bc_compute_full_version-us... of Package linphoneqt

Overview Repositories Revisions Requests Users Attributes Meta

File linphoneqt-02-remove-bc_compute_full_version-usage.patch of Package linphoneqt (Revision bdc49b88b1c7de18be0ad4e8242d28f3)

Currently displaying revision bdc49b88b1c7de18be0ad4e8242d28f3 , Show latest

diff -U 3 -H -b -B -d -r -N -x '*.rej' -x '*.orig' -x '*~' -- a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
--- a/linphone-app/CMakeLists.txt
+++ b/linphone-app/CMakeLists.txt
@@ -27,23 +27,11 @@
 set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 Belcard LibLinphone)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
+include(linphoneqt_version.cmake)
 find_package(BCToolbox)
 if(NOT BCToolbox_FOUND)
 	find_package(bctoolbox CONFIG REQUIRED)
 endif()
-if(NOT LINPHONEAPP_VERSION)
-	bc_compute_full_version(LINPHONEAPP_VERSION)
-endif()
-set(version_major)
-set(version_minor)
-set(version_patch)
-set(identifiers )
-set(metadata )
-bc_parse_full_version("${LINPHONEAPP_VERSION}" version_major version_minor version_patch identifiers metadata)
-
-
-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
 
 if(ENABLE_BUILD_VERBOSE)
 	#message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
diff -U 3 -H -b -B -d -r -N -x '*.rej' -x '*.orig' -x '*~' -- a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt
--- a/linphone-app/build/CMakeLists.txt
+++ b/linphone-app/build/CMakeLists.txt
@@ -46,11 +46,6 @@
   "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 -U 3 -H -b -B -d -r -N -x '*.rej' -x '*.orig' -x '*~' -- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
@@ -39,15 +39,7 @@
 # ==============================================================================
 # Build package version.
 # ==============================================================================
-
-if (GIT_EXECUTABLE AND NOT(LINPHONEAPP_VERSION))
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} describe --always
-    OUTPUT_VARIABLE LINPHONEAPP_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.."
-  )
-elseif (NOT(LINPHONEAPP_VERSION))
+if (NOT(APP_PROJECT_VERSION))
   set(LINPHONEAPP_VERSION "0.0.0")
 endif ()

Places

File linphoneqt-02-remove-bc_compute_full_version-usage.patch of Package linphoneqt (Revision bdc49b88b1c7de18be0ad4e8242d28f3)

Places