Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
imjiangjun
pbrt-v4
提交
6f685a2f
P
pbrt-v4
项目概览
imjiangjun
/
pbrt-v4
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
pbrt-v4
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6f685a2f
编写于
8月 07, 2021
作者:
M
Matt Pharr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add libdeflate as a submodule
上级
4e625835
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
1 deletion
+16
-1
.gitmodules
.gitmodules
+3
-0
CMakeLists.txt
CMakeLists.txt
+4
-1
src/ext/CMakeLists.txt
src/ext/CMakeLists.txt
+8
-0
src/ext/libdeflate
src/ext/libdeflate
+1
-0
未找到文件。
.gitmodules
浏览文件 @
6f685a2f
...
...
@@ -21,3 +21,6 @@
path = src/ext/openvdb
url = https://github.com/AcademySoftwareFoundation/openvdb.git
branch = feature/nanovdb
[submodule "src/ext/libdeflate"]
path = src/ext/libdeflate
url = https://github.com/mmp/libdeflate.git
CMakeLists.txt
浏览文件 @
6f685a2f
...
...
@@ -56,11 +56,12 @@ function (CHECK_EXT NAME DIR HASH)
endfunction
()
check_ext
(
"OpenEXR"
"openexr/OpenEXR"
5cfb5dab6dfada731586b0281bdb15ee75e26782
)
check_ext
(
"OpenVDB"
"openvdb/nanovdb"
1c306bcaf7e9f7d52525bab716202bd4f7fff5d1
)
check_ext
(
"Ptex"
"ptex/src"
4cd8e9a6db2b06e478dfbbd8c26eb6df97f84483
)
check_ext
(
"double-conversion"
"double-conversion/cmake"
cc1f75a114aca8d2af69f73a5a959aecbab0e87a
)
check_ext
(
"filesystem"
"filesystem/filesystem"
f45da753728cde9b1c380b343e41c8b1ca6498d7
)
check_ext
(
"libdeflate"
"libdeflate/common"
1fd0bea6ca2073c68493632dafc4b1ddda1bcbc3
)
check_ext
(
"stb"
"stb/tools"
b42009b3b9d4ca35bc703f5310eedc74f584be58
)
check_ext
(
"OpenVDB"
"openvdb/nanovdb"
1c306bcaf7e9f7d52525bab716202bd4f7fff5d1
)
check_ext
(
"zlib"
"zlib/doc"
54d591eabf9fe0e84c725638f8d5d8d202a093fa
)
add_compile_definitions
(
"$<$<CONFIG:DEBUG>:PBRT_DEBUG_BUILD>"
)
...
...
@@ -821,6 +822,7 @@ target_include_directories (pbrt_lib PUBLIC
${
STB_INCLUDE
}
${
OPENEXR_INCLUDE
}
${
ZLIB_INCLUDE_DIRS
}
${
LIBDEFLATE_INCLUDE_DIRS
}
${
FILESYSTEM_INCLUDE
}
${
PTEX_INCLUDE
}
${
DOUBLE_CONVERSION_INCLUDE
}
...
...
@@ -848,6 +850,7 @@ set (ALL_PBRT_LIBS
${
OPENEXR_LIBS
}
Ptex_static
${
ZLIB_LIBRARIES
}
${
LIBDEFLATE_LIBRARIES
}
double-conversion
${
PBRT_CUDA_LIB
}
)
...
...
src/ext/CMakeLists.txt
浏览文件 @
6f685a2f
...
...
@@ -15,6 +15,14 @@ set (STB_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
set
(
FILESYSTEM_INCLUDE
${
CMAKE_CURRENT_SOURCE_DIR
}
/filesystem PARENT_SCOPE
)
###########################################################################
# libdeflate
add_subdirectory
(
libdeflate
)
set
(
LIBDEFLATE_INCLUDE_DIRS
${
CMAKE_CURRENT_SOURCE_DIR
}
/libdeflate PARENT_SCOPE
)
set
(
LIBDEFLATE_LIBRARIES deflate::deflate PARENT_SCOPE
)
###########################################################################
# zlib
...
...
libdeflate
@
1fd0bea6
Subproject commit 1fd0bea6ca2073c68493632dafc4b1ddda1bcbc3
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录