Sweep major CMake files for use of include/lib instead of CMAKE_INSTALL_INCLUDE/LIBDIR

swolchok · swolchok · commit 6aaffa48f4d7 · 2025-07-24T17:59:21.000-07:00
Supposed to use the latter. (This is the thing that causes binaries to show up in lib64 for some weird builds, for example.) ghstack-source-id: c3b72a9 ghstack-comment-id: 3111516638 Pull-Request: #12792
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -224,7 +224,7 @@ if(EXECUTORCH_BUILD_CPUINFO)
   install(
     TARGETS cpuinfo
     EXPORT ExecuTorchTargets
-    DESTINATION lib
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
     INCLUDES
     DESTINATION ${_common_include_directories}
   )
@@ -267,7 +267,7 @@ if(EXECUTORCH_BUILD_PTHREADPOOL)
   install(
     TARGETS pthreadpool pthreadpool_interface fxdiv
     EXPORT ExecuTorchTargets
-    DESTINATION lib
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
     INCLUDES
     DESTINATION ${_common_include_directories}
   )
diff --git a/backends/apple/coreml/CMakeLists.txt b/backends/apple/coreml/CMakeLists.txt
@@ -115,7 +115,7 @@ if(APPLE)
 endif()
 target_compile_options(coreml_util PUBLIC -fPIC)
 
-install(TARGETS coreml_util DESTINATION lib)
+install(TARGETS coreml_util DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(
   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
@@ -154,7 +154,7 @@ target_compile_options(coreml_inmemoryfs PUBLIC -fPIC)
 
 install(
   TARGETS coreml_inmemoryfs
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
@@ -251,7 +251,7 @@ if(APPLE)
   install(
     TARGETS coremldelegate coreml_util coreml_inmemoryfs
     EXPORT ExecuTorchTargets
-    DESTINATION lib
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
     INCLUDES
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   )
diff --git a/backends/apple/mps/CMakeLists.txt b/backends/apple/mps/CMakeLists.txt
@@ -77,7 +77,7 @@ target_compile_options(mpsdelegate PRIVATE "-fno-objc-arc")
 install(
   TARGETS mpsdelegate mps_schema
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/backends/cortex_m/CMakeLists.txt b/backends/cortex_m/CMakeLists.txt
@@ -52,6 +52,6 @@ gen_operators_lib(
 
 install(
   TARGETS cortex_m_kernels cortex_m_ops_lib
-  DESTINATION lib
-  PUBLIC_HEADER DESTINATION include/executorch/backends/cortex_m/ops/
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/backends/cortex_m/ops/
 )
diff --git a/backends/mediatek/CMakeLists.txt b/backends/mediatek/CMakeLists.txt
@@ -45,5 +45,5 @@ executorch_target_link_options_shared_lib(neuron_backend)
 install(
   TARGETS neuron_backend
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
diff --git a/backends/openvino/CMakeLists.txt b/backends/openvino/CMakeLists.txt
@@ -51,7 +51,7 @@ executorch_target_link_options_shared_lib(openvino_backend)
 if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
     # Build executor runner binary for openvino backend
     list(APPEND openvino_executor_runner_libs openvino_backend executorch)
-    
+
     set(_openvino_executor_runner__srcs
         ${EXECUTORCH_ROOT}/examples/portable/executor_runner/executor_runner.cpp
         ${EXECUTORCH_ROOT}/extension/data_loader/file_data_loader.cpp
@@ -60,9 +60,9 @@ if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
         ${EXECUTORCH_ROOT}/extension/runner_util/inputs_portable.cpp
         )
     add_executable(openvino_executor_runner ${_openvino_executor_runner__srcs})
-    
+
     list(APPEND openvino_executor_runner_libs)
-    
+
     target_link_libraries(
       openvino_executor_runner gflags portable_ops_lib ${openvino_executor_runner_libs}
     )
@@ -72,4 +72,4 @@ endif()
 
 
 # Install OpenVINO backend library to the lib directory
-install(TARGETS openvino_backend DESTINATION lib)
+install(TARGETS openvino_backend DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/backends/qualcomm/CMakeLists.txt b/backends/qualcomm/CMakeLists.txt
@@ -232,7 +232,7 @@ add_subdirectory(
 install(
   TARGETS qnn_executorch_backend
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 # QNN pybind
diff --git a/backends/vulkan/CMakeLists.txt b/backends/vulkan/CMakeLists.txt
@@ -140,7 +140,7 @@ endif()
 install(
   TARGETS vulkan_backend vulkan_schema
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${COMMON_INCLUDES}
 )
diff --git a/configurations/CMakeLists.txt b/configurations/CMakeLists.txt
@@ -63,6 +63,6 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
   install(
     TARGETS optimized_native_cpu_ops_lib
     EXPORT ExecuTorchTargets
-    DESTINATION lib
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()
diff --git a/extension/data_loader/CMakeLists.txt b/extension/data_loader/CMakeLists.txt
@@ -36,7 +36,7 @@ target_compile_options(extension_data_loader PUBLIC ${_common_compile_options})
 install(
   TARGETS extension_data_loader
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/extension/flat_tensor/CMakeLists.txt b/extension/flat_tensor/CMakeLists.txt
@@ -31,7 +31,7 @@ target_compile_options(extension_flat_tensor PUBLIC ${_common_compile_options})
 install(
   TARGETS extension_flat_tensor
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/extension/llm/custom_ops/CMakeLists.txt b/extension/llm/custom_ops/CMakeLists.txt
@@ -89,7 +89,7 @@ target_compile_options(custom_ops PUBLIC ${_common_compile_options})
 install(
   TARGETS custom_ops
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 if(EXECUTORCH_BUILD_KERNELS_LLM_AOT)
diff --git a/extension/module/CMakeLists.txt b/extension/module/CMakeLists.txt
@@ -56,7 +56,7 @@ target_compile_options(
 install(
   TARGETS extension_module extension_module_static
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/extension/tensor/CMakeLists.txt b/extension/tensor/CMakeLists.txt
@@ -28,7 +28,7 @@ target_compile_options(extension_tensor PUBLIC ${_common_compile_options})
 install(
   TARGETS extension_tensor
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/extension/threadpool/CMakeLists.txt b/extension/threadpool/CMakeLists.txt
@@ -43,7 +43,7 @@ target_compile_options(extension_threadpool PUBLIC ${_common_compile_options})
 install(
   TARGETS extension_threadpool
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/extension/training/CMakeLists.txt b/extension/training/CMakeLists.txt
@@ -83,7 +83,7 @@ endif()
 install(
   TARGETS extension_training
   EXPORT ExecuTorchTargets
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
   INCLUDES
   DESTINATION ${_common_include_directories}
 )
diff --git a/kernels/optimized/CMakeLists.txt b/kernels/optimized/CMakeLists.txt
@@ -83,6 +83,6 @@ install(
   # it.
   TARGETS cpublas optimized_kernels optimized_ops_lib eigen_blas
   EXPORT ExecuTorchTargets
-  DESTINATION lib
-  PUBLIC_HEADER DESTINATION include/executorch/kernels/optimized/
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/kernels/optimized/
 )
diff --git a/kernels/optimized/External/EigenBLAS.cmake b/kernels/optimized/External/EigenBLAS.cmake
@@ -53,6 +53,6 @@ set_property(TARGET eigen_blas PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 install(
   TARGETS eigen_blas
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
diff --git a/kernels/portable/CMakeLists.txt b/kernels/portable/CMakeLists.txt
@@ -91,13 +91,13 @@ if(EXECUTORCH_BUILD_PTHREADPOOL AND EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
   install(
     TARGETS optimized_portable_kernels optimized_portable_ops_lib
     EXPORT ExecuTorchTargets
-    DESTINATION lib
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
 endif()
 
 install(
   TARGETS portable_kernels portable_ops_lib
   EXPORT ExecuTorchTargets
-  DESTINATION lib
-  PUBLIC_HEADER DESTINATION include/executorch/kernels/portable/
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/kernels/portable/
 )
diff --git a/kernels/quantized/CMakeLists.txt b/kernels/quantized/CMakeLists.txt
@@ -152,6 +152,6 @@ gen_operators_lib(
 install(
   TARGETS quantized_kernels quantized_ops_lib
   EXPORT ExecuTorchTargets
-  DESTINATION lib
-  PUBLIC_HEADER DESTINATION include/executorch/kernels/quantized/
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/kernels/quantized/
 )
diff --git a/runtime/executor/test/CMakeLists.txt b/runtime/executor/test/CMakeLists.txt
@@ -176,5 +176,5 @@ executorch_target_link_options_shared_lib(test_backend_compiler_lib)
 
 install(
   TARGETS test_backend_compiler_lib
-  DESTINATION lib
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ target_compile_options(mpsdelegate PRIVATE "-fno-objc-arc")`
`77`	`77`	`install(`
`78`	`78`	`TARGETS mpsdelegate mps_schema`
`79`	`79`	`EXPORT ExecuTorchTargets`
`80`		`- DESTINATION lib`
	`80`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`81`	`81`	`INCLUDES`
`82`	`82`	`DESTINATION ${_common_include_directories}`
`83`	`83`	`)`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ gen_operators_lib(`
`52`	`52`
`53`	`53`	`install(`
`54`	`54`	`TARGETS cortex_m_kernels cortex_m_ops_lib`
`55`		`- DESTINATION lib`
`56`		`- PUBLIC_HEADER DESTINATION include/executorch/backends/cortex_m/ops/`
	`55`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
	`56`	`+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/executorch/backends/cortex_m/ops/`
`57`	`57`	`)`
Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,5 @@ executorch_target_link_options_shared_lib(neuron_backend)`
`45`	`45`	`install(`
`46`	`46`	`TARGETS neuron_backend`
`47`	`47`	`EXPORT ExecuTorchTargets`
`48`		`- DESTINATION lib`
	`48`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`49`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ add_subdirectory(`
`232`	`232`	`install(`
`233`	`233`	`TARGETS qnn_executorch_backend`
`234`	`234`	`EXPORT ExecuTorchTargets`
`235`		`- DESTINATION lib`
	`235`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`236`	`236`	`)`
`237`	`237`
`238`	`238`	`# QNN pybind`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ endif()`
`140`	`140`	`install(`
`141`	`141`	`TARGETS vulkan_backend vulkan_schema`
`142`	`142`	`EXPORT ExecuTorchTargets`
`143`		`- DESTINATION lib`
	`143`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`144`	`144`	`INCLUDES`
`145`	`145`	`DESTINATION ${COMMON_INCLUDES}`
`146`	`146`	`)`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)`
`63`	`63`	`install(`
`64`	`64`	`TARGETS optimized_native_cpu_ops_lib`
`65`	`65`	`EXPORT ExecuTorchTargets`
`66`		`- DESTINATION lib`
	`66`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`67`	`67`	`)`
`68`	`68`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ target_compile_options(extension_data_loader PUBLIC ${_common_compile_options})`
`36`	`36`	`install(`
`37`	`37`	`TARGETS extension_data_loader`
`38`	`38`	`EXPORT ExecuTorchTargets`
`39`		`- DESTINATION lib`
	`39`	`+ DESTINATION ${CMAKE_INSTALL_LIBDIR}`
`40`	`40`	`INCLUDES`
`41`	`41`	`DESTINATION ${_common_include_directories}`
`42`	`42`	`)`