Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
415a698b
O
Obs Studio
项目概览
小白菜888
/
Obs Studio
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Obs Studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
415a698b
编写于
7月 16, 2014
作者:
B
BtbN
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add support for build time dependency copying
上级
4b5b7534
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
98 addition
and
21 deletion
+98
-21
CMakeLists.txt
CMakeLists.txt
+0
-2
additional_install_files/.gitignore
additional_install_files/.gitignore
+8
-0
cmake/Modules/FindLibavcodec.cmake
cmake/Modules/FindLibavcodec.cmake
+10
-2
cmake/Modules/FindLibavformat.cmake
cmake/Modules/FindLibavformat.cmake
+10
-2
cmake/Modules/FindLibavutil.cmake
cmake/Modules/FindLibavutil.cmake
+10
-2
cmake/Modules/FindLibfdk.cmake
cmake/Modules/FindLibfdk.cmake
+8
-4
cmake/Modules/FindLibswresample.cmake
cmake/Modules/FindLibswresample.cmake
+10
-2
cmake/Modules/FindLibswscale.cmake
cmake/Modules/FindLibswscale.cmake
+10
-2
cmake/Modules/FindLibx264.cmake
cmake/Modules/FindLibx264.cmake
+10
-2
cmake/Modules/ObsHelpers.cmake
cmake/Modules/ObsHelpers.cmake
+20
-2
libobs/CMakeLists.txt
libobs/CMakeLists.txt
+2
-0
obs/CMakeLists.txt
obs/CMakeLists.txt
+0
-1
未找到文件。
CMakeLists.txt
浏览文件 @
415a698b
...
...
@@ -82,5 +82,3 @@ if(NOT INSTALLER_RUN)
else
()
obs_generate_multiarch_installer
()
endif
()
obs_install_additional
()
additional_install_files/.gitignore
0 → 100644
浏览文件 @
415a698b
*
!.gitignore
!data/
!exec32/
!exec64/
!libs32/
!libs64/
!misc/
cmake/Modules/FindLibavcodec.cmake
浏览文件 @
415a698b
...
...
@@ -22,14 +22,22 @@ else()
find_path
(
FFMPEG_INCLUDE_DIR
NAMES libavcodec/avcodec.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
${
_AVCODEC_INCLUDE_DIRS
}
"
${
_AVCODEC_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav
)
find_library
(
AVCODEC_LIB
NAMES avcodec
HINTS
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_AVCODEC_LIBRARY_DIRS
}
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
HINTS
"
${
FFMPEG_INCLUDE_DIR
}
/../lib"
"
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_AVCODEC_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBAVCODEC_INCLUDE_DIRS
${
FFMPEG_INCLUDE_DIR
}
CACHE PATH
"Libavcodec include dir"
)
set
(
LIBAVCODEC_LIBRARIES
${
AVCODEC_LIB
}
CACHE STRING
"Libavcodec libraries"
)
...
...
cmake/Modules/FindLibavformat.cmake
浏览文件 @
415a698b
...
...
@@ -22,14 +22,22 @@ else()
find_path
(
FFMPEG_INCLUDE_DIR
NAMES libavformat/avformat.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
${
_AVFORMAT_INCLUDE_DIRS
}
"
${
_AVFORMAT_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav
)
find_library
(
AVFORMAT_LIB
NAMES avformat
HINTS
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_AVFORMAT_LIBRARY_DIRS
}
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
HINTS
"
${
FFMPEG_INCLUDE_DIR
}
/../lib"
"
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_AVFORMAT_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBAVFORMAT_INCLUDE_DIRS
${
FFMPEG_INCLUDE_DIR
}
CACHE PATH
"Libavformat include dir"
)
set
(
LIBAVFORMAT_LIBRARIES
${
AVFORMAT_LIB
}
CACHE STRING
"Libavformat libraries"
)
...
...
cmake/Modules/FindLibavutil.cmake
浏览文件 @
415a698b
...
...
@@ -22,14 +22,22 @@ else()
find_path
(
FFMPEG_INCLUDE_DIR
NAMES libavutil/avutil.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
${
_AVUTIL_INCLUDE_DIRS
}
"
${
_AVUTIL_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav
)
find_library
(
AVUTIL_LIB
NAMES avutil
HINTS
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_AVUTIL_LIBRARY_DIRS
}
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
HINTS
"
${
FFMPEG_INCLUDE_DIR
}
/../lib"
"
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_AVUTIL_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBAVUTIL_INCLUDE_DIRS
${
FFMPEG_INCLUDE_DIR
}
CACHE PATH
"Libavutil include dir"
)
set
(
LIBAVUTIL_LIBRARIES
${
AVUTIL_LIB
}
CACHE STRING
"Libavutil libraries"
)
...
...
cmake/Modules/FindLibfdk.cmake
浏览文件 @
415a698b
...
...
@@ -22,17 +22,21 @@ else()
find_path
(
Libfdk_INCLUDE_DIR
NAMES fdk-aac/aacenc_lib.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV LibfdkPath
ENV FFmpegPath
${
_LIBFDK_INCLUDE_DIRS
}
"
${
_LIBFDK_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
)
find_library
(
Libfdk_LIB
NAMES fdk-aac libfdk-aac
HINTS
${
Libfdk_INCLUDE_DIR
}
/../lib
${
Libfdk_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_LIBFDK_LIBRARY_DIRS
}
"
${
Libfdk_INCLUDE_DIR
}
/../lib"
"
${
Libfdk_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
Libfdk_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
Libfdk_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_LIBFDK_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBFDK_INCLUDE_DIRS
${
Libfdk_INCLUDE_DIR
}
CACHE PATH
"Libfdk include dir"
)
...
...
cmake/Modules/FindLibswresample.cmake
浏览文件 @
415a698b
...
...
@@ -22,14 +22,22 @@ else()
find_path
(
FFMPEG_INCLUDE_DIR
NAMES libswresample/swresample.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
${
_SWRESAMPLE_INCLUDE_DIRS
}
"
${
_SWRESAMPLE_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav
)
find_library
(
SWRESAMPLE_LIB
NAMES swresample
HINTS
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_SWRESAMPLE_LIBRARY_DIRS
}
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
HINTS
"
${
FFMPEG_INCLUDE_DIR
}
/../lib"
"
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_SWRESAMPLE_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBSWRESAMPLE_INCLUDE_DIRS
${
FFMPEG_INCLUDE_DIR
}
CACHE PATH
"Libswresample include dir"
)
set
(
LIBSWRESAMPLE_LIBRARIES
${
SWRESAMPLE_LIB
}
CACHE STRING
"Libswresample libraries"
)
...
...
cmake/Modules/FindLibswscale.cmake
浏览文件 @
415a698b
...
...
@@ -22,14 +22,22 @@ else()
find_path
(
FFMPEG_INCLUDE_DIR
NAMES libswscale/swscale.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV FFmpegPath
${
_SWSCALE_INCLUDE_DIRS
}
"
${
_SWSCALE_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
PATH_SUFFIXES ffmpeg libav
)
find_library
(
SWSCALE_LIB
NAMES swscale
HINTS
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_SWSCALE_LIBRARY_DIRS
}
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
HINTS
"
${
FFMPEG_INCLUDE_DIR
}
/../lib"
"
${
FFMPEG_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
FFMPEG_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_SWSCALE_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBSWSCALE_INCLUDE_DIRS
${
FFMPEG_INCLUDE_DIR
}
CACHE PATH
"Libswscale include dir"
)
set
(
LIBSWSCALE_LIBRARIES
${
SWSCALE_LIB
}
CACHE STRING
"Libswscale libraries"
)
...
...
cmake/Modules/FindLibx264.cmake
浏览文件 @
415a698b
...
...
@@ -22,14 +22,22 @@ else()
find_path
(
X264_INCLUDE_DIR
NAMES x264.h
HINTS
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files/include"
"$ENV{obsAdditionalInstallFiles}/include"
ENV x264Path
ENV FFmpegPath
${
_X264_INCLUDE_DIRS
}
"
${
_X264_INCLUDE_DIRS
}
"
/usr/include /usr/local/include /opt/local/include /sw/include
)
find_library
(
X264_LIB
NAMES x264 libx264
HINTS
${
X264_INCLUDE_DIR
}
/../lib
${
X264_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
${
_X264_LIBRARY_DIRS
}
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
HINTS
"
${
X264_INCLUDE_DIR
}
/../lib"
"
${
X264_INCLUDE_DIR
}
/../lib
${
_lib_suffix
}
"
"
${
X264_INCLUDE_DIR
}
/../libs
${
_lib_suffix
}
"
"
${
X264_INCLUDE_DIR
}
/lib
${
_lib_suffix
}
"
"
${
_X264_LIBRARY_DIRS
}
"
/usr/lib /usr/local/lib /opt/local/lib /sw/lib
)
set
(
LIBX264_INCLUDE_DIRS
${
X264_INCLUDE_DIR
}
CACHE PATH
"x264 include dir"
)
set
(
LIBX264_LIBRARIES
${
X264_LIB
}
CACHE STRING
"x264 libraries"
)
...
...
cmake/Modules/ObsHelpers.cmake
浏览文件 @
415a698b
...
...
@@ -91,7 +91,15 @@ function(obs_generate_multiarch_installer)
USE_SOURCE_PERMISSIONS
)
endfunction
()
function
(
obs_install_additional
)
function
(
obs_helper_copy_dir target source dest
)
add_custom_command
(
TARGET
${
target
}
POST_BUILD
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy_directory
"
${
source
}
"
"
${
dest
}
"
VERBATIM
)
endfunction
()
function
(
obs_install_additional maintarget
)
set
(
addfdir
"
${
CMAKE_SOURCE_DIR
}
/additional_install_files"
)
if
(
DEFINED ENV{obsAdditionalInstallFiles}
)
set
(
addfdir
"$ENV{obsAdditionalInstallFiles}"
)
...
...
@@ -111,7 +119,7 @@ function(obs_install_additional)
DESTINATION
"
${
OBS_DATA_DESTINATION
}
"
USE_SOURCE_PERMISSIONS
PATTERN
".gitignore"
EXCLUDE
)
if
(
INSTALLER_RUN
)
install
(
DIRECTORY
"
${
addfdir
}
/libs32/"
DESTINATION
"
${
OBS_LIBRARY32_DESTINATION
}
"
...
...
@@ -139,6 +147,16 @@ function(obs_install_additional)
USE_SOURCE_PERMISSIONS
PATTERN
".gitignore"
EXCLUDE
)
endif
()
obs_helper_copy_dir
(
${
maintarget
}
"
${
addfdir
}
/misc/"
"
${
CMAKE_BINARY_DIR
}
/rundir/$<CONFIGURATION>/"
)
obs_helper_copy_dir
(
${
maintarget
}
"
${
addfdir
}
/data/"
"
${
CMAKE_BINARY_DIR
}
/rundir/$<CONFIGURATION>/
${
OBS_DATA_DESTINATION
}
/"
)
obs_helper_copy_dir
(
${
maintarget
}
"
${
addfdir
}
/exec
${
_lib_suffix
}
/"
"
${
CMAKE_BINARY_DIR
}
/rundir/$<CONFIGURATION>/
${
OBS_EXECUTABLE_DESTINATION
}
/"
)
endfunction
()
macro
(
export_obs_core target exportname
)
...
...
libobs/CMakeLists.txt
浏览文件 @
415a698b
...
...
@@ -287,3 +287,5 @@ target_link_libraries(libobs
install_obs_core
(
libobs EXPORT LibObs
)
install_obs_data
(
libobs data libobs
)
install_obs_headers
(
${
libobs_HEADERS
}
)
obs_install_additional
(
libobs
)
obs/CMakeLists.txt
浏览文件 @
415a698b
...
...
@@ -129,4 +129,3 @@ target_link_libraries(obs
install_obs_core
(
obs
)
install_obs_data
(
obs data obs-studio
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录