summaryrefslogtreecommitdiffstats
path: root/externals/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'externals/CMakeLists.txt')
-rw-r--r--externals/CMakeLists.txt22
1 files changed, 21 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 1f7cd598e..b1fd3ac62 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -42,6 +42,11 @@ endif()
# mbedtls
add_subdirectory(mbedtls)
target_include_directories(mbedtls PUBLIC ./mbedtls/include)
+if (NOT MSVC)
+ target_compile_options(mbedcrypto PRIVATE
+ -Wno-unused-but-set-variable
+ -Wno-string-concatenation)
+endif()
# MicroProfile
add_library(microprofile INTERFACE)
@@ -94,6 +99,12 @@ if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb)
set(BUILD_TOOLS OFF)
add_subdirectory(cubeb)
add_library(cubeb::cubeb ALIAS cubeb)
+ if (NOT MSVC)
+ if (TARGET speex)
+ target_compile_options(speex PRIVATE -Wno-sign-compare)
+ endif()
+ target_compile_options(cubeb PRIVATE -Wno-implicit-const-int-float-conversion)
+ endif()
endif()
# DiscordRPC
@@ -151,15 +162,24 @@ endif()
if (NOT TARGET LLVM::Demangle)
add_library(demangle demangle/ItaniumDemangle.cpp)
target_include_directories(demangle PUBLIC ./demangle)
+ if (NOT MSVC)
+ target_compile_options(demangle PRIVATE -Wno-deprecated-declarations) # std::is_pod
+ endif()
add_library(LLVM::Demangle ALIAS demangle)
endif()
-add_library(stb stb/stb_dxt.cpp)
+add_library(stb stb/stb_dxt.cpp stb/stb_image.cpp stb/stb_image_resize.cpp)
target_include_directories(stb PUBLIC ./stb)
add_library(bc_decoder bc_decoder/bc_decoder.cpp)
target_include_directories(bc_decoder PUBLIC ./bc_decoder)
+if (NOT TARGET RenderDoc::API)
+ add_library(renderdoc INTERFACE)
+ target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
+ add_library(RenderDoc::API ALIAS renderdoc)
+endif()
+
if (ANDROID)
if (ARCHITECTURE_arm64)
add_subdirectory(libadrenotools)