From 60cf24225f35b70576688da274c51ece16d867af Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 19 Oct 2024 21:59:15 -0400 Subject: [PATCH] chore(various): tedious updates (#3316) --- .gitmodules | 14 +++++++------- cmake/compile_definitions/linux.cmake | 5 ++++- tests/CMakeLists.txt | 1 - third-party/googletest | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed6ec248..be1c418a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ branch = master [submodule "packaging/linux/flatpak/deps/shared-modules"] path = packaging/linux/flatpak/deps/shared-modules - url = https://github.com/flathub/shared-modules + url = https://github.com/flathub/shared-modules.git branch = master [submodule "third-party/build-deps"] path = third-party/build-deps @@ -16,8 +16,8 @@ branch = master [submodule "third-party/googletest"] path = third-party/googletest - url = https://github.com/google/googletest/ - branch = v1.14.x + url = https://github.com/google/googletest.git + branch = main [submodule "third-party/inputtino"] path = third-party/inputtino url = https://github.com/games-on-whales/inputtino.git @@ -32,11 +32,11 @@ branch = master [submodule "third-party/nv-codec-headers"] path = third-party/nv-codec-headers - url = https://github.com/FFmpeg/nv-codec-headers + url = https://github.com/FFmpeg/nv-codec-headers.git branch = sdk/12.0 [submodule "third-party/nvapi-open-source-sdk"] path = third-party/nvapi-open-source-sdk - url = https://github.com/LizardByte/nvapi-open-source-sdk + url = https://github.com/LizardByte/nvapi-open-source-sdk.git branch = sdk [submodule "third-party/Simple-Web-Server"] path = third-party/Simple-Web-Server @@ -44,11 +44,11 @@ branch = master [submodule "third-party/TPCircularBuffer"] path = third-party/TPCircularBuffer - url = https://github.com/michaeltyson/TPCircularBuffer + url = https://github.com/michaeltyson/TPCircularBuffer.git branch = master [submodule "third-party/tray"] path = third-party/tray - url = https://github.com/LizardByte/tray + url = https://github.com/LizardByte/tray.git branch = master [submodule "third-party/ViGEmClient"] path = third-party/ViGEmClient diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake index 6f10aaf9..5bf24ba6 100644 --- a/cmake/compile_definitions/linux.cmake +++ b/cmake/compile_definitions/linux.cmake @@ -68,7 +68,10 @@ if(${SUNSHINE_ENABLE_CUDA}) # message(STATUS "CUDA NVCC Flags: ${CUDA_NVCC_FLAGS}") message(STATUS "CUDA Architectures: ${CMAKE_CUDA_ARCHITECTURES}") elseif(${CUDA_FAIL_ON_MISSING}) - message(FATAL_ERROR "CUDA not found") + message(FATAL_ERROR + "CUDA not found. + If this is intentional, set '-DSUNSHINE_ENABLE_CUDA=OFF' or '-DCUDA_FAIL_ON_MISSING=OFF'" + ) endif() endif() if(CUDA_FOUND) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9d626754..26602909 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -76,4 +76,3 @@ if (WIN32) # this fixes libcurl linking errors when using non MSYS2 version of CMake set_target_properties(${PROJECT_NAME} PROPERTIES LINK_SEARCH_START_STATIC 1) endif () - diff --git a/third-party/googletest b/third-party/googletest index f8d7d77c..b514bdc8 160000 --- a/third-party/googletest +++ b/third-party/googletest @@ -1 +1 @@ -Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571 +Subproject commit b514bdc898e2951020cbdca1304b75f5950d1f59