-
Notifications
You must be signed in to change notification settings - Fork 598
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.
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
Use xcb-errors library if it is available #2665
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ autoOption(GENERATE_MANPAGES "generate manpages") | |
option(COMPRESS_MANPAGES "compress manpages" ON) | ||
option(GENERATE_DOC "generate API documentation" ON) | ||
option(DO_COVERAGE "build with coverage" OFF) | ||
autoOption(WITH_XCB_ERRORS "build with xcb-errors") | ||
if (GENERATE_DOC AND DO_COVERAGE) | ||
message(STATUS "Not generating API documentation with DO_COVERAGE") | ||
set(GENERATE_DOC OFF) | ||
|
@@ -213,6 +214,16 @@ if(WITH_DBUS) | |
autoDisable(WITH_DBUS "DBus not found.") | ||
endif() | ||
endif() | ||
|
||
if(WITH_XCB_ERRORS) | ||
pkg_check_modules(XCB_ERRORS xcb-errors) | ||
if(XCB_ERRORS_FOUND) | ||
set(AWESOME_OPTIONAL_LDFLAGS ${AWESOME_OPTIONAL_LDFLAGS} ${XCB_ERRORS_LDFLAGS}) | ||
set(AWESOME_OPTIONAL_INCLUDE_DIRS ${AWESOME_OPTIONAL_INCLUDE_DIRS} ${XCB_ERRORS_INCLUDE_DIRS}) | ||
else() | ||
autoDisable(WITH_XCB_ERRORS "xcb-errors not found.") | ||
endif() | ||
endif() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could this default to AUTO, and cause an error if ON was used, but it is not available? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is no If you disagree, I can look into implementing There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure, just a quick idea. |
||
# }}} | ||
|
||
# {{{ Install path and configuration variables | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for not noticing earlier, but it would be better to add this to the
DO_COVERAGE=codecov
job.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Went ahead and amended your last commit.