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.

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

fix ubuntu20 build #3512

Merged
merged 1 commit into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ jobs:
driveID: *ubuntu22LibID

- build_vapor:
moveToCommand: ${f/Linux/Ubuntu20}
moveToCommand: ${f/Linux/Ubuntu22}

- store_artifacts:
path: /tmp/workspace/installers
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -535,28 +535,28 @@ if (UNIX AND NOT APPLE)
COMPONENT Dependencies
)

# Include libxcb-xinerama for Ubuntu 22 by reading /etc/issue
# Include libxcb-xinerama for Ubuntu 20/22 by reading /etc/issue
if (EXISTS /etc/issue)
file(READ "/etc/issue" ETC_ISSUE)
string(REGEX MATCH "Ubuntu" DIST ${ETC_ISSUE})
if(DIST STREQUAL "Ubuntu 22")
if(DIST STREQUAL "Ubuntu")
file (GLOB XCB_FILES ${THIRD_PARTY_LIB_DIR}/libxcb-xinerama.*)
install (
FILES ${XCB_FILES}
DESTINATION ${INSTALL_LIB_DIR}
COMPONENT Dependencies
)
endif (DIST STREQUAL "Ubuntu 22")
endif(DIST STREQUAL "Ubuntu")
endif (EXISTS /etc/issue)

install (
FILES ${QTDIR}/plugins/platforms/libqxcb.so
FILES ${THIRD_PARTY_DIR}/plugins/platforms/libqxcb.so
DESTINATION ${INSTALL_LIB_DIR}/platforms
COMPONENT Dependencies
)

install (
DIRECTORY ${QTDIR}/plugins/xcbglintegrations
DIRECTORY ${THIRD_PARTY_DIR}/plugins/xcbglintegrations
DESTINATION ${INSTALL_LIB_DIR}
COMPONENT Dependencies
)
Expand Down