]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32776 into master
authorJan Fajerski <jfajerski@suse.com>
Tue, 5 Jan 2021 11:50:37 +0000 (12:50 +0100)
committerJan Fajerski <jfajerski@suse.com>
Tue, 5 Jan 2021 11:50:37 +0000 (12:50 +0100)
* refs/pull/32776/head:
win32*.sh: fetch WNBD dependency
win32*.sh: bump win32 boost dependency
cmake: skip osd, Lua and neorados on Windows
win32*.sh: improve lib handling
win32*.sh: update openssl location
win32*.sh: cleanup dependency build dir when targetting Windows
win32*.sh: Strip binaries individually
win32*.sh: Cleanup zip archive creation
cmake,win32*.sh: Add OS=(ubuntu|suse) flag, for distro settings
win32*.sh: Use nproc for CPU count when targeting win32
test: Include compat.h to find uid_t/gid_t/gidlist when cross compiling
win32*.sh: improve win32 dependency check
win32*.sh: isolate network operations when building win32 dependencies
cmake: drop Python dependency when targeting Windows
win32*.sh: cleanup Windows build script
win32*.sh: fix patch command
win32*.sh: update Windows build scripts and readme

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
1  2 
CMakeLists.txt
src/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge