Skip to content

fetch libRocket via FetchContent instead of a submodule #7681

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
Goober5000 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −10
Open

fetch libRocket via FetchContent instead of a submodule #7681

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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ endif()

PROJECT(FS2_Open LANGUAGES ${FSO_LANGUAGES})

# Check if the external modules exists
IF(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib/libRocket/Build")
message(FATAL_ERROR "External submodules could not be found. Please make sure you have updated your submodules.")
endif()

LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finder")

Expand Down
1 change: 0 additions & 1 deletion lib/libRocket
Open in desktop
Submodule libRocket deleted from b0c18e
18 changes: 17 additions & 1 deletion lib/libRocket.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,23 @@
# Build script for libRocket =======
#===================================

set(LIBROCKET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libRocket")
# Fetch the libRocket sources. We only consume the source tree here (the
# Rocket* targets below are defined by this script, not by libRocket's own
# build system), and the repository has no top-level CMakeLists.txt, so
# FetchContent_MakeAvailable() populates it without calling add_subdirectory().
#
# Offline / local development: point FetchContent at an existing checkout to
# skip the download, e.g.
# -DFETCHCONTENT_SOURCE_DIR_LIBROCKET=/path/to/libRocket
# or set FETCHCONTENT_BASE_DIR to a shared cache so clean rebuilds reuse it.
include(FetchContent)
FetchContent_Declare(libRocket
GIT_REPOSITORY https://github.com/scp-fs2open/libRocket.git
GIT_TAG b0c18e17d257a46db8395485895185915f483ede
)
FetchContent_MakeAvailable(libRocket)

set(LIBROCKET_DIR "${librocket_SOURCE_DIR}")

if(COMMAND cmake_policy)
cmake_policy(SET CMP0015 NEW)
Expand Down
Loading