Browse Source
[cmake] fix jwt, VMA -> CPM
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/143/head
crueter
8 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
6 changed files with
11 additions and
11 deletions
-
.gitmodules
-
CMakeLists.txt
-
externals/CMakeLists.txt
-
externals/VulkanMemoryAllocator
-
src/video_core/CMakeLists.txt
-
src/web_service/CMakeLists.txt
|
|
|
@ -4,9 +4,6 @@ |
|
|
|
[submodule "libusb"] |
|
|
|
path = externals/libusb/libusb |
|
|
|
url = https://github.com/libusb/libusb.git |
|
|
|
[submodule "VulkanMemoryAllocator"] |
|
|
|
path = externals/VulkanMemoryAllocator |
|
|
|
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git |
|
|
|
[submodule "externals/boost-headers"] |
|
|
|
path = externals/boost-headers |
|
|
|
url = https://github.com/boostorg/headers.git |
|
|
|
|
|
|
|
@ -405,7 +405,6 @@ find_package(nlohmann_json 3.8 REQUIRED) |
|
|
|
find_package(RenderDoc MODULE) |
|
|
|
find_package(SimpleIni MODULE) |
|
|
|
find_package(stb MODULE) |
|
|
|
find_package(VulkanMemoryAllocator CONFIG) |
|
|
|
find_package(ZLIB 1.2 REQUIRED) |
|
|
|
find_package(zstd 1.5 REQUIRED) |
|
|
|
|
|
|
|
|
|
|
|
@ -219,7 +219,7 @@ endif() |
|
|
|
|
|
|
|
# cpp-jwt |
|
|
|
if (ENABLE_WEB_SERVICE) |
|
|
|
set(CPM_USE_LOCAL_PACKAGES ON) |
|
|
|
set(CPM_USE_LOCAL_PACKAGES OFF) |
|
|
|
|
|
|
|
CPMAddPackage( |
|
|
|
NAME cpp-jwt |
|
|
|
@ -305,9 +305,14 @@ add_subdirectory(boost-headers) |
|
|
|
add_subdirectory(nx_tzdb) |
|
|
|
|
|
|
|
# VMA |
|
|
|
if (NOT TARGET GPUOpen::VulkanMemoryAllocator) |
|
|
|
add_subdirectory(VulkanMemoryAllocator) |
|
|
|
endif() |
|
|
|
set(CPM_USE_LOCAL_PACKAGES ON) |
|
|
|
|
|
|
|
CPMAddPackage( |
|
|
|
NAME VulkanMemoryAllocator |
|
|
|
URL "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/archive/1076b348ab.zip" |
|
|
|
URL_HASH SHA512=a46b44e4286d08cffda058e856c47f44c7fed3da55fe9555976eb3907fdcc20ead0b1860b0c38319cda01dbf9b1aa5d4b4038c7f1f8fbd97283d837fa9af9772 |
|
|
|
FIND_PACKAGE_ARGUMENTS "CONFIG" |
|
|
|
) |
|
|
|
|
|
|
|
if (NOT TARGET LLVM::Demangle) |
|
|
|
add_library(demangle demangle/ItaniumDemangle.cpp) |
|
|
|
|
|
|
|
@ -1 +0,0 @@ |
|
|
|
Subproject commit 1076b348abd17859a116f4b111c43d58a588a086 |
|
|
|
@ -329,7 +329,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS}) |
|
|
|
add_dependencies(video_core host_shaders) |
|
|
|
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) |
|
|
|
|
|
|
|
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers VulkanUtilityHeaders GPUOpen::VulkanMemoryAllocator) |
|
|
|
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers VulkanUtilityHeaders) |
|
|
|
|
|
|
|
if (ENABLE_NSIGHT_AFTERMATH) |
|
|
|
if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK}) |
|
|
|
|
|
|
|
@ -15,7 +15,7 @@ add_library(web_service STATIC |
|
|
|
) |
|
|
|
|
|
|
|
create_target_directory_groups(web_service) |
|
|
|
target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt) |
|
|
|
target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib) |
|
|
|
|
|
|
|
if (YUZU_USE_PRECOMPILED_HEADERS) |
|
|
|
target_precompile_headers(web_service PRIVATE precompiled_headers.h) |
|
|
|
|
