mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-12-15 16:18:56 +00:00
Merge remote-tracking branch 'upstream/main'
This commit is contained in:
21
externals/CMakeLists.txt
vendored
21
externals/CMakeLists.txt
vendored
@@ -25,11 +25,6 @@ if (NOT TARGET fmt::fmt)
|
||||
add_subdirectory(fmt)
|
||||
endif()
|
||||
|
||||
# Discord-RPC
|
||||
set(BUILD_EXAMPLES OFF CACHE BOOL "")
|
||||
add_subdirectory(discord-rpc)
|
||||
target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC)
|
||||
# If it is clang and MSVC we will add a static lib
|
||||
# CryptoPP
|
||||
@@ -147,11 +142,17 @@ if (WIN32)
|
||||
target_compile_options(sirit PUBLIC "-Wno-error=unused-command-line-argument")
|
||||
endif()
|
||||
|
||||
# date
|
||||
if (APPLE AND NOT TARGET date::date-tz)
|
||||
option(BUILD_TZ_LIB "" ON)
|
||||
option(USE_SYSTEM_TZ_DB "" ON)
|
||||
add_subdirectory(date)
|
||||
if (APPLE)
|
||||
# half
|
||||
add_library(half INTERFACE)
|
||||
target_include_directories(half INTERFACE half/include)
|
||||
|
||||
# date
|
||||
if (NOT TARGET date::date-tz)
|
||||
option(BUILD_TZ_LIB "" ON)
|
||||
option(USE_SYSTEM_TZ_DB "" ON)
|
||||
add_subdirectory(date)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Tracy
|
||||
|
||||
1
externals/discord-rpc
vendored
1
externals/discord-rpc
vendored
Submodule externals/discord-rpc deleted from 4ec218155d
2
externals/glslang
vendored
2
externals/glslang
vendored
Submodule externals/glslang updated: 4422273e84...12cbda959b
1
externals/half
vendored
Submodule
1
externals/half
vendored
Submodule
Submodule externals/half added at 1ddada2251
2
externals/robin-map
vendored
2
externals/robin-map
vendored
Submodule externals/robin-map updated: 1115dad3ff...2c48a1a502
2
externals/sirit
vendored
2
externals/sirit
vendored
Submodule externals/sirit updated: 8db09231c4...37090c74cc
2
externals/toml11
vendored
2
externals/toml11
vendored
Submodule externals/toml11 updated: 26d403e461...4b74012723
Reference in New Issue
Block a user