From 99ec5a7f1367bfed8cfc1cd6774ddf703f619c1c Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 14 Jul 2025 11:09:22 -0700 Subject: [PATCH] Update [ghstack-poisoned] --- CMakeLists.txt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83a1db3d7b7..8caaecf9e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,11 +112,12 @@ set(CMAKE_SKIP_BUILD_RPATH OFF) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Automatically add all linked folders that are NOT in the build directory to # the rpath (per library?) -# TODO: Doesn't work for us right now because we are -# not installing .so's into the correct locations. For example we have -# libcustom_ops_aot_lib.so depending on _portable_lib.so, which was eventually -# put under /executorch/extension/pybindings/ but this rpath is -# not automatically added because at build time it seems `portable_lib` is being +# +# TODO: Doesn't work for us right now because we are not installing .so's into +# the correct locations. For example we have libcustom_ops_aot_lib.so depending +# on _portable_lib.so, which was eventually put under +# /executorch/extension/pybindings/ but this rpath is not +# automatically added because at build time it seems `portable_lib` is being # built under the same directory, so no extra rpath is being added. To properly # fix this we need to install `portable_lib` into the correct path. set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) @@ -321,8 +322,9 @@ if(EXECUTORCH_USE_CPP_CODE_COVERAGE) " -fprofile-instr-generate -fcoverage-mapping" ) else() - message(FATAL_ERROR - "Code coverage for compiler ${CMAKE_CXX_COMPILER_ID} is unsupported" + message( + FATAL_ERROR + "Code coverage for compiler ${CMAKE_CXX_COMPILER_ID} is unsupported" ) endif() endif() @@ -633,8 +635,8 @@ if(EXECUTORCH_BUILD_PYBIND) endif() if(EXECUTORCH_BUILD_XNNPACK) - # need to explicitly specify XNNPACK and xnnpack-microkernels-prod here otherwise - # uses XNNPACK and microkernel-prod symbols from libtorch_cpu + # need to explicitly specify XNNPACK and xnnpack-microkernels-prod here + # otherwise uses XNNPACK and microkernel-prod symbols from libtorch_cpu list(APPEND _dep_libs xnnpack_backend XNNPACK xnnpack-microkernels-prod) endif()