Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
linphone-cmake-builder
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
linphone-cmake-builder
Commits
083e1827
Commit
083e1827
authored
Feb 29, 2016
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix packaging with openh264 on Windows.
parent
e0127283
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
config-desktop.cmake
configs/config-desktop.cmake
+1
-1
CMakeLists.txt
configs/desktop/linphone_package/CMakeLists.txt
+6
-0
No files found.
configs/config-desktop.cmake
View file @
083e1827
...
...
@@ -170,7 +170,7 @@ if(ENABLE_PACKAGING)
SOURCE_DIR
"
${
CMAKE_CURRENT_LIST_DIR
}
/desktop/linphone_package"
DOWNLOAD_COMMAND
""
CMAKE_GENERATOR
${
CMAKE_GENERATOR
}
CMAKE_ARGS
${
LINPHONE_BUILDER_EP_ARGS
}
-DCMAKE_INSTALL_PREFIX=
${
LINPHONE_BUILDER_WORK_DIR
}
/PACKAGE -DLINPHONE_OUTPUT_DIR=
${
CMAKE_INSTALL_PREFIX
}
-DLINPHONE_SOURCE_DIR=
${
EP_linphone_SOURCE_DIR
}
-DENABLE_ZRTP:BOOL=
${
ENABLE_ZRTP
}
-DENABLE_OPENH264:BOOL=
${
ENABLE_OPENH264
}
-DOPENH264_VERSION=
${
EP_openh264_VERSION
}
CMAKE_ARGS
${
LINPHONE_BUILDER_EP_ARGS
}
-DCMAKE_INSTALL_PREFIX=
${
LINPHONE_BUILDER_WORK_DIR
}
/PACKAGE -D
TOOLS_DIR=
${
CMAKE_BINARY_DIR
}
/programs -D
LINPHONE_OUTPUT_DIR=
${
CMAKE_INSTALL_PREFIX
}
-DLINPHONE_SOURCE_DIR=
${
EP_linphone_SOURCE_DIR
}
-DENABLE_ZRTP:BOOL=
${
ENABLE_ZRTP
}
-DENABLE_OPENH264:BOOL=
${
ENABLE_OPENH264
}
-DOPENH264_VERSION=
${
EP_openh264_VERSION
}
)
elseif
((
LINPHONE_BUILDER_TARGET STREQUAL ms2
)
OR
(
LINPHONE_BUILDER_TARGET STREQUAL ms2-plugins
))
# Mediastreamer SDK packages
...
...
configs/desktop/linphone_package/CMakeLists.txt
View file @
083e1827
...
...
@@ -148,6 +148,12 @@ if(WIN32)
)
if
(
ENABLE_OPENH264
)
# Include bunzip2.exe and bzip2.dll to be able to extract the openh264 file downloaded from Cisco
install
(
DIRECTORY
"
${
TOOLS_DIR
}
/"
DESTINATION
"bin"
COMPONENT
"msopenh264"
FILES_MATCHING PATTERN
"b*zip2.*"
)
install
(
DIRECTORY
"
${
LINPHONE_OUTPUT_DIR
}
/lib/mediastreamer/plugins/"
DESTINATION
"lib/mediastreamer/plugins"
COMPONENT
"msopenh264"
...
...
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