Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 09:48:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12869 from highfidelity/RC66

Browse source 
RC66 merge back to master
This commit is contained in:
Stephen Birarda 2018-04-11 15:11:34 -07:00 committed by GitHub
commit 2759f3a51c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/externals/serverless-content/CMakeLists.txt vendored
View file

@ -4,8 +4,8 @@ set(EXTERNAL_NAME serverless-content)
ExternalProject_Add( ExternalProject_Add(
${EXTERNAL_NAME} ${EXTERNAL_NAME}
URL http://cdn.highfidelity.com/content-sets/serverless-tutorial-RC66-v2.zip URL http://cdn.highfidelity.com/content-sets/serverless-tutorial-RC66-v3.zip
URL_MD5 d76bdb3e2bf7ae5d20115bd97b0c44a8 URL_MD5 ea608c2e4c90539ab3c1d66acf0e005a
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""

3
cmake/templates/NSIS.template.in
View file

@ -1234,6 +1234,9 @@ Section "Uninstall"
@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@ @CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
;Remove the installer information file
Delete "$INSTDIR\installer.ini"
;Remove files we installed. ;Remove files we installed.
;Keep the list of directories here in sync with the File commands above. ;Keep the list of directories here in sync with the File commands above.
@CPACK_NSIS_DELETE_FILES@ @CPACK_NSIS_DELETE_FILES@