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
6957a800
Commit
6957a800
authored
Jun 26, 2017
by
Wescoeur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(assets): move linphone.ico, linphone.rc & linphone.desktop in this folder
parent
c1e93ffa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
4 deletions
+4
-4
CMakeLists.txt
CMakeLists.txt
+2
-2
linphone.desktop
assets/linphone.desktop
+0
-0
linphone.ico
assets/linphone.ico
+0
-0
linphone.rc
assets/linphone.rc
+0
-0
CMakeLists.txt
cmake_builder/linphone_package/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
6957a800
...
...
@@ -297,7 +297,7 @@ qt5_add_resources(RESOURCES ${QRC_RESOURCES})
# Build.
# Note: `update_translations` is provided by `languages/CMakeLists.txt`.
if
(
WIN32
)
add_executable
(
${
TARGET_NAME
}
WIN32
${
SOURCES
}
${
HEADERS
}
${
RESOURCES
}
linphone.rc
)
add_executable
(
${
TARGET_NAME
}
WIN32
${
SOURCES
}
${
HEADERS
}
${
RESOURCES
}
assets/
linphone.rc
)
else
()
add_executable
(
${
TARGET_NAME
}
${
SOURCES
}
${
HEADERS
}
${
RESOURCES
}
${
QML_SOURCES
}
)
endif
()
...
...
@@ -352,7 +352,7 @@ install(TARGETS ${TARGET_NAME}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
install
(
FILES
"linphone.desktop"
install
(
FILES
"
assets/
linphone.desktop"
DESTINATION
"
${
CMAKE_INSTALL_DATADIR
}
/applications"
)
install
(
FILES
"
${
ASSETS_DIR
}
/images/linphone_logo.svg"
...
...
linphone.desktop
→
assets/
linphone.desktop
View file @
6957a800
File moved
linphone.ico
→
assets/
linphone.ico
View file @
6957a800
File moved
linphone.rc
→
assets/
linphone.rc
View file @
6957a800
File moved
cmake_builder/linphone_package/CMakeLists.txt
View file @
6957a800
...
...
@@ -323,8 +323,8 @@ if(WIN32)
set
(
CPACK_GENERATOR
"NSIS"
)
set
(
CPACK_PACKAGE_ICON
"
${
CMAKE_CURRENT_SOURCE_DIR
}
\\\\
linphone-banner.bmp"
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
CPACK_PACKAGE_NAME
}
-
${
LINPHONE_GIT_REVISION
}
-win32"
)
set
(
CPACK_NSIS_MUI_ICON
"
${
LINPHONE_DESKTOP_DIR
}
/linphone.ico"
)
set
(
CPACK_NSIS_MUI_UNIICON
"
${
LINPHONE_DESKTOP_DIR
}
/linphone.ico"
)
set
(
CPACK_NSIS_MUI_ICON
"
${
LINPHONE_DESKTOP_DIR
}
/
assets/
linphone.ico"
)
set
(
CPACK_NSIS_MUI_UNIICON
"
${
LINPHONE_DESKTOP_DIR
}
/
assets/
linphone.ico"
)
set
(
CPACK_NSIS_DISPLAY_NAME
"Linphone"
)
if
(
LINPHONE_MICRO_VERSION
)
set
(
CPACK_NSIS_PACKAGE_NAME
"Linphone
${
LINPHONE_MAJOR_VERSION
}
.
${
LINPHONE_MINOR_VERSION
}
.
${
LINPHONE_MICRO_VERSION
}
"
)
...
...
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