Skip to content

Commit

Permalink
Remove Wayland dependencies and conditionally build Antora
Browse files Browse the repository at this point in the history
Wayland dependencies were removed from the workflows and build configurations to streamline the installation process. The Antora documentation build is now conditional, preventing unnecessary inclusion when VKB_GENERATE_ANTORA_SITE is not set. This improves build flexibility and reduces extraneous steps.
  • Loading branch information
gpx1000 committed Dec 17, 2024
1 parent eeedab5 commit cd1f0be
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-Antora-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
sudo gem install rouge
sudo apt-get update
sudo apt install xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
sudo apt install xorg-dev libglu1-mesa-dev
sudo apt-get install -y asciidoctor
pip install lxml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: Install RandR headers
run: |
sudo apt-get update
sudo apt install xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
sudo apt install xorg-dev libglu1-mesa-dev
- if: ${{ matrix.platform == 'windows' }}
name: Setup MSVC
uses: ilammy/msvc-dev-cmd@v1
Expand All @@ -52,7 +52,7 @@ jobs:
- if: ${{ matrix.platform != 'windows' }}
name: Configure and build
run: |
cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON
cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -DGLFW_BUILD_WAYLAND=OFF
cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
build_d2d:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
name: Install RandR headers
run: |
sudo apt-get update
sudo apt install xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
sudo apt install xorg-dev libglu1-mesa-dev
- name: Configure
run: cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON
run: cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DGLFW_BUILD_WAYLAND=OFF

- name: "Build Components ${{ matrix.platform }} in ${{ matrix.build_type }}"
run: cmake --build "build/${{ matrix.platform }}" --target vkb__components --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ cmake_minimum_required(VERSION 3.16)

project(vulkan_samples)

if(VKB_GENERATE_ANTORA_SITE)
add_subdirectory(antora)
else ()
# search for Vulkan SDK
find_package(Vulkan)

Expand Down Expand Up @@ -104,5 +107,4 @@ endif()

# Add vulkan app (runs all samples)
add_subdirectory(app)

add_subdirectory(antora)
endif ()
1 change: 0 additions & 1 deletion antora/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ function(gatherAntoraAssets)
samples
scripts
shaders
third_party
)
set(PAGES_DIR_SEARCH)
set(IMAGES_DIR_SEARCH)
Expand Down

0 comments on commit cd1f0be

Please sign in to comment.