Skip to content

Fix Cmake distribution detection #901

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

Merged
azonenberg merged 5 commits into from
Sep 23, 2025
Merged

Fix Cmake distribution detection #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2fa5aa
.github/workflows/build-debian: install lsb-release for cmake
mastensg Sep 23, 2025
93eb5ab
CMakeLists: execute lsb_release correctly
mastensg Sep 23, 2025
eed317b
.github/workflows/build-arch: install lsb-release for cmake
mastensg Sep 23, 2025
1b87c91
.github/workflows/build-fedora: install lsb-release for cmake
mastensg Sep 23, 2025
f871b0e
CMakeLists: fail loudly on lsb_release errors
mastensg Sep 23, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/build-arch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ jobs:
hidapi \
ccache \
ninja \
vulkan-swrast
vulkan-swrast \
lsb-release

- name: Install Docs Dependencies
if: ${{ matrix.docs }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ jobs:
glslang-dev \
glslang-tools \
spirv-tools \
glslc
glslc \
lsb-release

- name: Install Docs Dependencies
if: ${{ matrix.docs }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ jobs:
ninja-build \
fedora-packager \
rpmdevtools \
mesa-vulkan-drivers
mesa-vulkan-drivers \
lsb-release

- name: Install Docs Dependencies
if: ${{ matrix.docs }}
Expand Down
12 changes: 7 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,15 @@ set(CPACK_STRIP_FILES TRUE)

# Figure out what distro version we're on
if(LINUX)
find_program(LSB_RELEASE_EXEC lsb_release)
execute_process(COMMAND ${LSB_RELEASE_EXEC} -is 2>&1
find_program(LSB_RELEASE_EXEC lsb_release REQUIRED)
execute_process(COMMAND ${LSB_RELEASE_EXEC} -is
OUTPUT_VARIABLE DISTRO_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs 2>&1
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND_ERROR_IS_FATAL ANY)
execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs
OUTPUT_VARIABLE DISTRO_VER
OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND_ERROR_IS_FATAL ANY)

message(STATUS "Linux distribution target for packaging: name ${DISTRO_NAME}, version ${DISTRO_VER}")

Expand Down
Loading