Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1202 from ctrlaltdavid/feature/vircadia-web

Browse source 
Include Vircadia Web app as a Git submodule
This commit is contained in:
Kalila 2021-05-08 14:25:32 -04:00 committed by GitHub
commit f27473532b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "vircadia-web"]
path = vircadia-web
url = ../vircadia-web.git

8
CMakeLists.txt
View file

@ -274,12 +274,18 @@ add_custom_target(cmake SOURCES ${CMAKE_SRC})
GroupSources("cmake")
unset(CMAKE_SRC)
file(GLOB_RECURSE JS_SRC scripts/*.js unpublishedScripts/*.js)
file(GLOB_RECURSE JS_SRC scripts/*.* unpublishedScripts/*.*)
add_custom_target(js SOURCES ${JS_SRC})
GroupSources("scripts")
GroupSources("unpublishedScripts")
unset(JS_SRC)
file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
GroupSources("vircadia-web")
unset(WEB_APP_SRC)
set_packaging_parameters()
# Locate the required Qt build on the filesystem

1
vircadia-web Submodule

@ -0,0 +1 @@
Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf