Browse Source

cmake-format

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3308/head
crueter 3 weeks ago
parent
commit
ff6343d4a4
  1. 3
      src/common/CMakeLists.txt
  2. 28
      src/core/CMakeLists.txt

3
src/common/CMakeLists.txt

@ -152,8 +152,7 @@ add_library(
zstd_compression.cpp
zstd_compression.h
fs/ryujinx_compat.h fs/ryujinx_compat.cpp
fs/symlink.h fs/symlink.cpp
)
fs/symlink.h fs/symlink.cpp)
if(WIN32)
target_sources(common PRIVATE windows/timer_resolution.cpp

28
src/core/CMakeLists.txt

@ -1163,8 +1163,7 @@ add_library(core STATIC
tools/freezer.cpp
tools/freezer.h
tools/renderdoc.cpp
tools/renderdoc.h
)
tools/renderdoc.h)
if (ENABLE_WIFI_SCAN)
# find_package(libiw REQUIRED)
@ -1194,8 +1193,7 @@ else()
-Werror=conversion
-Wno-sign-conversion
-Wno-cast-function-type
$<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
)
$<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>)
# pre-clang19 will spam with "OH DID YOU MEAN THIS?" otherwise...
if (CXX_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19)
target_compile_options(core PRIVATE -Wno-cast-function-type-mismatch)
@ -1211,7 +1209,13 @@ else()
target_link_libraries(core PUBLIC Boost::headers)
endif()
target_link_libraries(core PRIVATE fmt::fmt nlohmann_json::nlohmann_json RenderDoc::API MbedTLS::mbedcrypto${MBEDTLS_LIB_SUFFIX} MbedTLS::mbedtls${MBEDTLS_LIB_SUFFIX})
target_link_libraries(core PRIVATE
fmt::fmt
nlohmann_json::nlohmann_json
RenderDoc::API
MbedTLS::mbedcrypto${MBEDTLS_LIB_SUFFIX}
MbedTLS::mbedtls${MBEDTLS_LIB_SUFFIX}
httplib::httplib)
if (ENABLE_WEB_SERVICE)
target_compile_definitions(core PUBLIC ENABLE_WEB_SERVICE)
@ -1233,8 +1237,7 @@ if (HAS_NCE)
arm/nce/interpreter_visitor.h
arm/nce/patcher.cpp
arm/nce/patcher.h
arm/nce/visitor_base.h
)
arm/nce/visitor_base.h)
target_link_libraries(core PRIVATE merry::oaknut)
endif()
@ -1254,8 +1257,7 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
hle/service/jit/jit_context.cpp
hle/service/jit/jit_context.h
hle/service/jit/jit.cpp
hle/service/jit/jit.h
)
hle/service/jit/jit.h)
target_link_libraries(core PRIVATE dynarmic::dynarmic)
endif()
@ -1265,23 +1267,19 @@ if(ENABLE_OPENSSL)
find_package(OpenSSL REQUIRED)
target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto httplib::httplib)
target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto)
target_compile_definitions(core PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
elseif (APPLE)
target_sources(core PRIVATE
hle/service/ssl/ssl_backend_securetransport.cpp)
target_link_libraries(core PRIVATE "-framework Security" httplib::httplib)
target_link_libraries(core PRIVATE "-framework Security")
elseif (WIN32)
target_sources(core PRIVATE
hle/service/ssl/ssl_backend_schannel.cpp)
target_link_libraries(core PRIVATE crypt32 secur32)
if (NOT MINGW)
target_link_libraries(core PRIVATE httplib::httplib)
endif()
else()
target_sources(core PRIVATE
hle/service/ssl/ssl_backend_none.cpp)
target_link_libraries(core PRIVATE httplib::httplib)
endif()
create_target_directory_groups(core)
Loading…
Cancel
Save