Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Ubuntu and Debian Package creation with Cmake #590

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support Ubuntu and Debian Package creation with Cmake #590

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3af67cc
Add preliminary support to build Debian packages with Cmake infrastru…
DifanZhang Sep 3, 2019
d007004
Merge branch 'master' into master
DifanZhang Sep 3, 2019
f6ede7e
Use tab instead of spaces for indention.
DifanZhang Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ endif (with-zbc)

if (with-rbd)
find_library(LIBRBD rbd)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, librados2, librbd1")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, librados2, librbd1")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just make the first patch "Add preliminary support to build Debian packages with Cmake infrastru…" use tabs from the beginning.


# Stuff for building the rbd handler
add_library(handler_rbd
Expand Down Expand Up @@ -256,8 +256,8 @@ if (with-glfs)
set(GFAPI_VERSION760 1)
endif (GFAPI760_FOUND)

set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, glusterfs-common")
set(GFAPI_VERSION766 0)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, glusterfs-common")
set(GFAPI_VERSION766 0)

pkg_check_modules(GFAPI766 glusterfs-api>=7.6.6 QUIET)
if (GFAPI766_FOUND)
Expand Down Expand Up @@ -285,7 +285,7 @@ endif (with-glfs)

if (with-qcow)
find_package(ZLIB REQUIRED)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, zlib1g")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, zlib1g")

# Stuff for building the qcow handler
add_library(handler_qcow
Expand Down