Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 22:39:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1527 from ctrlaltdavid/dev/remove-submodule

Browse source 
Remove Vircadia Web app submodule and add automatic detection instead.
This commit is contained in:
Kalila 2021-12-16 17:37:41 -05:00 committed by GitHub
commit 1c11dfc664
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

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

22
CMakeLists.txt
View file

@ -349,11 +349,23 @@ GroupSources("scripts")
GroupSources("unpublishedScripts") GroupSources("unpublishedScripts")
unset(JS_SRC) unset(JS_SRC)
file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*) # Include Vircadia Web app files if cloned into a subdirectory.
list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" ) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web")
add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC}) file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*)
GroupSources("vircadia-web") list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" )
unset(WEB_APP_SRC) add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC})
GroupSources("vircadia-web")
unset(WEB_APP_SRC)
endif()
# Include Vircadia Web SDK files if cloned into a subdirectory.
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk")
file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*)
list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" )
add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC})
GroupSources("vircadia-web-sdk")
unset(WEB_SDK_SRC)
endif()
set_packaging_parameters() set_packaging_parameters()

1
vircadia-web

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