Skip to content

Install Catch2 locally in Init.sh so it no longer requires sudo #189

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
BenjaFriend merged 1 commit into from
Aug 16, 2026
Merged

Install Catch2 locally in Init.sh so it no longer requires sudo #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[submodule "external/Catch2"]
path = external/Catch2
url = https://github.com/flingengine/Catch2.git
ignore = dirty
[submodule "external/glm"]
path = external/glm
url = https://github.com/flingengine/glm.git
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ include (InstallRequiredSystemLibraries)

set ( FLING_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}" )

# Catch2 is installed locally by Init.sh (not system-wide) so find_package can locate it without sudo
list( APPEND CMAKE_PREFIX_PATH "${FLING_ROOT_DIR}/external/Catch2/install" )

# Option for the current build configuration. Note: going forward, we should use the FLING_Compiler_Flag macro
OPTION( DEFINE_SHIPPING "DEFINE_SHIPPING configuration will change asset paths to be relative." OFF )
OPTION( WITH_IMGUI_FLAG "WITH_IMGUI_FLAG will enable or disable the addition of IMGUI to the rendering pipeline. " ON )
Expand Down
6 changes: 3 additions & 3 deletions Init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ echo =============================================================
echo Initalizing submodules...
git submodule update --init --recursive

# Install Catch2 so that CMake can find it
# Install Catch2 so that CMake can find it (installed locally so no sudo is needed)
echo Installing Catch2 testing library...
cmake ./external/Catch2 -B ./external/Catch2/build
sudo make install --directory=./external/Catch2/build -j$(nproc)
cmake ./external/Catch2 -B ./external/Catch2/build -DCMAKE_INSTALL_PREFIX=./external/Catch2/install
make install --directory=./external/Catch2/build -j$(nproc)

# Run cmake!
echo Running CMake
Expand Down
Loading