Skip to content

Add utils to CMake build #1241

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

Open
Masterkatze wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Add utils to CMake build #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
08f151a
Add fgdlib and vbsp to CMake
Masterkatze Jul 26, 2025
0e92b4f
Add vvis, vmpi, lzma to CMake
Masterkatze Jun 21, 2026
9da39cf
Do not compile vmpi and libcurl when DNEO_VMPI is OFF
Masterkatze Aug 2, 2025
eb9e883
Add vrad and vice to CMake
Masterkatze Aug 3, 2025
39d7f31
More utils changes
Masterkatze Aug 12, 2025
c8e1b2c
Fix warnings
Masterkatze Feb 9, 2026
92bc192
Fix some bugs in vbsp
Masterkatze Jun 21, 2026
78f933a
Remove VMPI
Masterkatze Jun 21, 2026
d9aa7fc
Some cleanup
Masterkatze Jun 22, 2026
7aeb20d
Add vvis (initial)
Masterkatze Jun 22, 2026
f8c57aa
Make vbsp and vvis run from a build dir
Masterkatze Jul 1, 2026
7dd163e
Add vrad
Masterkatze Jul 3, 2026
c3b8dab
Add vice
Masterkatze Jul 3, 2026
019315a
Some fixes
Masterkatze Jul 4, 2026
5785bec
Refactor CMake install code
Masterkatze Jul 8, 2026
96a80af
More fixes
Masterkatze Jul 9, 2026
609010c
CMake install refactor, add utils scripts
Masterkatze Jul 13, 2026
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
42 changes: 38 additions & 4 deletions .github/workflows/cibuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

matrix:
platform:
- { display_name: 'Linux Native Libraries', os: ubuntu-24.04, preset_os: linux }
- { display_name: 'Linux Libraries', os: ubuntu-24.04, preset_os: linux }

preset_build_type:
- { display_name: 'Debug', name: debug }
Expand Down Expand Up @@ -86,6 +86,7 @@ jobs:
-DNEO_COPY_LIBRARIES=OFF
-DNEO_USE_SEPARATE_BUILD_INFO=ON
-DNEO_INSTALL_LIBRARIES=ON
-DNEO_INSTALL_UTILS=ON
-DNEO_INSTALL_RESOURCES=OFF
-DNEO_EXTRA_ASSETS_ALT_PATH=${{ github.workspace }}/neoAssets

Expand Down Expand Up @@ -130,6 +131,8 @@ jobs:
echo "libraries_debuginfo=$(find . -regex '\.\/neo-\w*-\w*-libraries-debuginfo-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "dedicated=$(find . -regex '\.\/neo-\w*-\w*-dedicated-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "dedicated_debuginfo=$(find . -regex '\.\/neo-\w*-\w*-dedicated-debuginfo-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "utils=$(find . -regex '\.\/neo-\w*-\w*-utils-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "utils_debuginfo=$(find . -regex '\.\/neo-\w*-\w*-utils-debuginfo-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "gamedata=$(find . -regex '\.\/neo-\w*-\w*-gamedata' -printf '%f')" >> "$GITHUB_ENV"

- name: Upload libraries
Expand Down Expand Up @@ -160,6 +163,20 @@ jobs:
path: ${{ env.install_dir }}/${{ env.dedicated_debuginfo }}
if-no-files-found: error

- name: Upload utils
uses: actions/upload-artifact@v7
with:
name: ${{ env.utils }}
path: ${{ env.install_dir }}/${{ env.utils }}
if-no-files-found: error

- name: Upload utils debug information
uses: actions/upload-artifact@v7
with:
name: ${{ env.utils_debuginfo }}
path: ${{ env.install_dir }}/${{ env.utils_debuginfo }}
if-no-files-found: error

- name: Upload SourceMod gamedata
if: ${{ matrix.preset_build_type.name == 'release' }}
uses: actions/upload-artifact@v7
Expand All @@ -182,7 +199,7 @@ jobs:

matrix:
platform:
- { display_name: 'Windows Native Libraries', os: windows-2022, preset_os: windows }
- { display_name: 'Windows Libraries', os: windows-2022, preset_os: windows }

preset_build_type:
- { display_name: 'Debug', name: debug }
Expand Down Expand Up @@ -241,6 +258,7 @@ jobs:
-DNEO_COPY_LIBRARIES=OFF
-DNEO_USE_SEPARATE_BUILD_INFO=ON
-DNEO_INSTALL_LIBRARIES=ON
-DNEO_INSTALL_UTILS=ON
-DNEO_INSTALL_RESOURCES=OFF
-DNEO_EXTRA_ASSETS_ALT_PATH=${{ github.workspace }}/neoAssets

Expand Down Expand Up @@ -285,7 +303,8 @@ jobs:
echo "libraries_debuginfo=$(find . -regex '\.\/neo-\w*-\w*-libraries-debuginfo-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "dedicated=$(find . -regex '\.\/neo-\w*-\w*-dedicated-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "dedicated_debuginfo=$(find . -regex '\.\/neo-\w*-\w*-dedicated-debuginfo-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "gamedata=$(find . -regex '\.\/neo-\w*-\w*-gamedata' -printf '%f')" >> "$GITHUB_ENV"
echo "utils=$(find . -regex '\.\/neo-\w*-\w*-utils-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"
echo "utils_debuginfo=$(find . -regex '\.\/neo-\w*-\w*-utils-debuginfo-\w*-\w*' -printf '%f')" >> "$GITHUB_ENV"

- name: Upload libraries
uses: actions/upload-artifact@v7
Expand Down Expand Up @@ -315,8 +334,22 @@ jobs:
path: ${{ env.install_dir }}/${{ env.dedicated_debuginfo }}
if-no-files-found: error

- name: Upload utils
uses: actions/upload-artifact@v7
with:
name: ${{ env.utils }}
path: ${{ env.install_dir }}/${{ env.utils }}
if-no-files-found: error

- name: Upload utils debug information
uses: actions/upload-artifact@v7
with:
name: ${{ env.utils_debuginfo }}
path: ${{ env.install_dir }}/${{ env.utils_debuginfo }}
if-no-files-found: error

pack-resources:
name: Windows Native Resources
name: Windows Resources

runs-on: windows-2022

Expand Down Expand Up @@ -357,6 +390,7 @@ jobs:
-DNEO_USE_CCACHE=OFF
-DNEO_COPY_LIBRARIES=OFF
-DNEO_INSTALL_LIBRARIES=OFF
-DNEO_INSTALL_UTILS=OFF
-DNEO_INSTALL_RESOURCES=ON

- name: Install resources
Expand Down
Loading