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
+47 −2
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
12 changes: 12 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Target Devel <[email protected]>
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/open-iscsi/tcmu-runner")
include(CPack)

Copy link
Collaborator

@mikechristie mikechristie Sep 3, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I think you need to rebase and repush by doing a forced push, so we do not end up seeing this in the final pull and commit.

If everyone adds junk like this then it gets messy in the main git tree.

[edit]

That comment was for the commit:

Merge branch 'master' into master
@DifanZhang
DifanZhang committed 19 hours ago

if (with-tcmalloc)
find_library(TCMALLOC_LIB tcmalloc)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
endif(with-tcmalloc)

# Stuff for building the shared library
add_library(tcmu
SHARED
Expand Down Expand Up @@ -252,6 +257,13 @@ if (with-glfs)
endif (GFAPI760_FOUND)

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)
set(GFAPI_VERSION766 1)
endif (GFAPI766_FOUND)

# Stuff for building the glfs handler
add_library(handler_glfs
SHARED
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.