61 lines
3.4 KiB
Plaintext
61 lines
3.4 KiB
Plaintext
-- Fix CPU detection for FreeBSD amd64 (uses lowercase 'amd64', not 'AMD64').
|
|
-- Disable BUILD_CUSTOM_PROTOBUF to use system protobuf.
|
|
-- Enable USE_SYSTEM_SLEEF, USE_SYSTEM_PYBIND11, USE_SYSTEM_ONNX to use system libraries.
|
|
-- Disable -Werror=* flags that cause build failures on FreeBSD.
|
|
--- CMakeLists.txt.orig 2026-07-08 17:44:27 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -185,7 +185,7 @@ set(CPU_RISCV OFF)
|
|
set(CPU_POWER OFF)
|
|
set(CPU_RISCV OFF)
|
|
|
|
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|x86_64)")
|
|
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)")
|
|
set(CPU_INTEL ON)
|
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
|
|
set(CPU_AARCH64 ON)
|
|
@@ -217,7 +217,7 @@ option(BUILD_CUSTOM_PROTOBUF
|
|
option(ATEN_NO_TEST "Do not build ATen test binaries" OFF)
|
|
option(BUILD_BINARY "Build C++ binaries" OFF)
|
|
option(BUILD_CUSTOM_PROTOBUF
|
|
- "Build and use Caffe2's own protobuf under third_party" ON)
|
|
+ "Build and use Caffe2's own protobuf under third_party" OFF)
|
|
option(BUILD_PYTHON "Build Python binaries" ON)
|
|
option(BUILD_LITE_INTERPRETER "Master flag to build Lite Interpreter" OFF)
|
|
option(BUILD_SHARED_LIBS "Build libcaffe2.so" ON)
|
|
@@ -498,15 +498,15 @@ option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo
|
|
# USE_SYSTEM_LIBS being "OFF".
|
|
option(USE_SYSTEM_LIBS "Use all available system-provided libraries." OFF)
|
|
option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo." OFF)
|
|
-option(USE_SYSTEM_SLEEF "Use system-provided sleef." OFF)
|
|
+option(USE_SYSTEM_SLEEF "Use system-provided sleef." ON)
|
|
option(USE_SYSTEM_GLOO "Use system-provided gloo." OFF)
|
|
option(USE_SYSTEM_FP16 "Use system-provided fp16." OFF)
|
|
-option(USE_SYSTEM_PYBIND11 "Use system-provided PyBind11." OFF)
|
|
+option(USE_SYSTEM_PYBIND11 "Use system-provided PyBind11." ON)
|
|
option(USE_SYSTEM_PTHREADPOOL "Use system-provided pthreadpool." OFF)
|
|
option(USE_SYSTEM_PSIMD "Use system-provided psimd." OFF)
|
|
option(USE_SYSTEM_FXDIV "Use system-provided fxdiv." OFF)
|
|
option(USE_SYSTEM_BENCHMARK "Use system-provided google benchmark." OFF)
|
|
-option(USE_SYSTEM_ONNX "Use system-provided onnx." OFF)
|
|
+option(USE_SYSTEM_ONNX "Use system-provided onnx." ON)
|
|
option(USE_SYSTEM_XNNPACK "Use system-provided xnnpack." OFF)
|
|
option(USE_SYSTEM_NVTX "Use system-provided nvtx." OFF)
|
|
option(USE_GOLD_LINKER "Use ld.gold to link" OFF)
|
|
@@ -1104,11 +1104,11 @@ if(NOT MSVC)
|
|
# Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
|
|
string(APPEND CMAKE_CXX_FLAGS " -Wall")
|
|
string(APPEND CMAKE_CXX_FLAGS " -Wextra")
|
|
- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS)
|
|
- append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS)
|
|
- append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS)
|
|
- append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS)
|
|
- append_cxx_flag_if_supported("-Werror=bool-operation" CMAKE_CXX_FLAGS)
|
|
+ #append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS)
|
|
+ #append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS)
|
|
+ #append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS)
|
|
+ #append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS)
|
|
+ #append_cxx_flag_if_supported("-Werror=bool-operation" CMAKE_CXX_FLAGS)
|
|
append_cxx_flag_if_supported("-Wnarrowing" CMAKE_CXX_FLAGS)
|
|
append_cxx_flag_if_supported("-Wno-missing-field-initializers"
|
|
CMAKE_CXX_FLAGS)
|