projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e7acd82
2c6c19d
)
Merge pull request #932 from r-chris/make-zlib-optional
author
Kim Kulling
<kimkulling@users.noreply.github.com>
Mon, 4 Jul 2016 13:00:13 +0000
(15:00 +0200)
committer
GitHub
<noreply@github.com>
Mon, 4 Jul 2016 13:00:13 +0000
(15:00 +0200)
Allowing to enable building of zlib manually through CMake option.
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
Simple merge