test

Author: CISC

vendor/cpp-httplib/CMakeLists.txt

@@ -6,8 +6,11 @@ find_package(Threads REQUIRED)
 llama_add_compile_flags()
 
 add_library(${TARGET} STATIC httplib.cpp httplib.h)
-if (NOT MSVC)
-    # disable warnings in 3rd party code
+
+# disable warnings in 3rd party code
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    target_compile_options(${TARGET} PRIVATE /w)
+else()
     target_compile_options(${TARGET} PRIVATE -w)
 endif()
 
@@ -148,16 +151,20 @@ elseif (LLAMA_OPENSSL)
     endif()
 endif()
 
-if(LLAMA_BUILD_BORINGSSL AND LLAMA_FATAL_WARNINGS)
-    # disable fatal warnings in 3rd party code
-    if (MSVC)
-        get_target_property(target_options fipsmodule COMPILE_OPTIONS)
-        message(STATUS "Target options: ${target_options}")
-        target_compile_options(crypto PRIVATE /WX-)
-        target_compile_options(fipsmodule PRIVATE /WX-)
+# disable warnings in 3rd party code
+if(LLAMA_BUILD_BORINGSSL OR LLAMA_BUILD_LIBRESSL)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        target_compile_options(ssl PRIVATE /w)
+        target_compile_options(crypto PRIVATE /w)
+        if(LLAMA_BUILD_BORINGSSL)
+            target_compile_options(fipsmodule PRIVATE /w)
+        endif()
     else()
+        target_compile_options(ssl PRIVATE -w)
         target_compile_options(crypto PRIVATE -w)
-        target_compile_options(fipsmodule PRIVATE -w)
+        if(LLAMA_BUILD_BORINGSSL)
+            target_compile_options(fipsmodule PRIVATE -w)
+        endif()
     endif()
 endif()