Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
e3ac002e
Commit
e3ac002e
authored
Jun 13, 2017
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix packaging if version number has only 2 digits.
parent
b4c4702e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
CMakeLists.txt
cmake_builder/linphone_package/CMakeLists.txt
+12
-3
No files found.
cmake_builder/linphone_package/CMakeLists.txt
View file @
e3ac002e
...
@@ -40,9 +40,12 @@ else()
...
@@ -40,9 +40,12 @@ else()
endif
()
endif
()
string
(
REGEX REPLACE
"([0-9.]+)-?.*"
"
\\
1"
LINPHONE_VERSION
"
${
LINPHONE_GIT_REVISION
}
"
)
string
(
REGEX REPLACE
"([0-9.]+)-?.*"
"
\\
1"
LINPHONE_VERSION
"
${
LINPHONE_GIT_REVISION
}
"
)
string
(
REPLACE
"."
";"
SPLITTED_LINPHONE_VERSION
${
LINPHONE_VERSION
}
)
string
(
REPLACE
"."
";"
SPLITTED_LINPHONE_VERSION
${
LINPHONE_VERSION
}
)
list
(
LENGTH SPLITTED_LINPHONE_VERSION SPLITTED_LINPHONE_VERSION_LENGTH
)
list
(
GET SPLITTED_LINPHONE_VERSION 0 LINPHONE_MAJOR_VERSION
)
list
(
GET SPLITTED_LINPHONE_VERSION 0 LINPHONE_MAJOR_VERSION
)
list
(
GET SPLITTED_LINPHONE_VERSION 1 LINPHONE_MINOR_VERSION
)
list
(
GET SPLITTED_LINPHONE_VERSION 1 LINPHONE_MINOR_VERSION
)
list
(
GET SPLITTED_LINPHONE_VERSION 2 LINPHONE_MICRO_VERSION
)
if
(
SPLITTED_LINPHONE_VERSION_LENGTH GREATER 2
)
list
(
GET SPLITTED_LINPHONE_VERSION 2 LINPHONE_MICRO_VERSION
)
endif
()
set
(
PACKAGE_VERSION
"
${
LINPHONE_VERSION
}
"
)
set
(
PACKAGE_VERSION
"
${
LINPHONE_VERSION
}
"
)
# Preparing the Linphone SDK bundle
# Preparing the Linphone SDK bundle
...
@@ -294,7 +297,9 @@ set(CPACK_PACKAGE_NAME "Linphone")
...
@@ -294,7 +297,9 @@ set(CPACK_PACKAGE_NAME "Linphone")
set
(
CPACK_PACKAGE_VENDOR
"Belledonne communications"
)
set
(
CPACK_PACKAGE_VENDOR
"Belledonne communications"
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
${
LINPHONE_MAJOR_VERSION
}
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
${
LINPHONE_MAJOR_VERSION
}
)
set
(
CPACK_PACKAGE_VERSION_MINOR
${
LINPHONE_MINOR_VERSION
}
)
set
(
CPACK_PACKAGE_VERSION_MINOR
${
LINPHONE_MINOR_VERSION
}
)
set
(
CPACK_PACKAGE_VERSION_PATCH
${
LINPHONE_MICRO_VERSION
}
)
if
(
LINPHONE_MICRO_VERSION
)
set
(
CPACK_PACKAGE_VERSION_PATCH
${
LINPHONE_MICRO_VERSION
}
)
endif
()
set
(
CPACK_PACKAGE_EXECUTABLES
"linphone;Linphone"
)
set
(
CPACK_PACKAGE_EXECUTABLES
"linphone;Linphone"
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"Linphone"
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"Linphone"
)
set
(
CPACK_RESOURCE_FILE_LICENSE
"
${
LINPHONE_SOURCE_DIR
}
/COPYING"
)
set
(
CPACK_RESOURCE_FILE_LICENSE
"
${
LINPHONE_SOURCE_DIR
}
/COPYING"
)
...
@@ -321,7 +326,11 @@ if(WIN32)
...
@@ -321,7 +326,11 @@ if(WIN32)
set
(
CPACK_NSIS_MUI_ICON
"
${
LINPHONE_DESKTOP_DIR
}
/linphone.ico"
)
set
(
CPACK_NSIS_MUI_ICON
"
${
LINPHONE_DESKTOP_DIR
}
/linphone.ico"
)
set
(
CPACK_NSIS_MUI_UNIICON
"
${
LINPHONE_DESKTOP_DIR
}
/linphone.ico"
)
set
(
CPACK_NSIS_MUI_UNIICON
"
${
LINPHONE_DESKTOP_DIR
}
/linphone.ico"
)
set
(
CPACK_NSIS_DISPLAY_NAME
"Linphone"
)
set
(
CPACK_NSIS_DISPLAY_NAME
"Linphone"
)
set
(
CPACK_NSIS_PACKAGE_NAME
"Linphone
${
LINPHONE_MAJOR_VERSION
}
.
${
LINPHONE_MINOR_VERSION
}
.
${
LINPHONE_MICRO_VERSION
}
"
)
if
(
LINPHONE_MICRO_VERSION
)
set
(
CPACK_NSIS_PACKAGE_NAME
"Linphone
${
LINPHONE_MAJOR_VERSION
}
.
${
LINPHONE_MINOR_VERSION
}
.
${
LINPHONE_MICRO_VERSION
}
"
)
else
()
set
(
CPACK_NSIS_PACKAGE_NAME
"Linphone
${
LINPHONE_MAJOR_VERSION
}
.
${
LINPHONE_MINOR_VERSION
}
"
)
endif
()
set
(
CPACK_NSIS_URL_INFO_ABOUT
"http://www.linphone.org/"
)
set
(
CPACK_NSIS_URL_INFO_ABOUT
"http://www.linphone.org/"
)
file
(
TO_NATIVE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
DOS_STYLE_SOURCE_DIR
)
file
(
TO_NATIVE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
DOS_STYLE_SOURCE_DIR
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment