append to CMAKE_PREFIX_PATH instead of setting executorch_DIR

swolchok · swolchok · commit 5d762b20c193 · 2025-07-18T18:06:58.000-07:00
I think the <package>_DIR mechanism is too low-level -- it helps find <package>, but not any dependencies that <package> also installed next to itself. CMAKE_PREFIX_PATH does both. ghstack-source-id: 2a41508 ghstack-comment-id: 3085703979 Pull-Request: #12618
diff --git a/examples/models/llama/CMakeLists.txt b/examples/models/llama/CMakeLists.txt
@@ -78,7 +78,7 @@ find_package(gflags REQUIRED)
 #
 
 # find `executorch` libraries Same as for gflags
-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..)
 find_package(executorch CONFIG REQUIRED)
 target_link_options_shared_lib(executorch)
 
diff --git a/examples/models/llava/CMakeLists.txt b/examples/models/llava/CMakeLists.txt
@@ -76,7 +76,7 @@ find_package(gflags REQUIRED)
 #
 
 # find `executorch` libraries Same as for gflags
-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..)
 find_package(executorch CONFIG REQUIRED)
 target_link_options_shared_lib(executorch)
 
diff --git a/examples/models/phi-3-mini/CMakeLists.txt b/examples/models/phi-3-mini/CMakeLists.txt
@@ -24,7 +24,7 @@ set(EXECUTORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
 set(_common_include_directories
     ${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type/c10
 )
-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..)
 find_package(executorch CONFIG REQUIRED)
 
 target_link_options_shared_lib(executorch)
diff --git a/extension/android/CMakeLists.txt b/extension/android/CMakeLists.txt
@@ -60,7 +60,7 @@ set_target_properties(fbjni PROPERTIES
   IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni/prefab/modules/fbjni/libs/android.${ANDROID_ABI}/libfbjni.so"
 )
 
-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../lib/cmake/ExecuTorch)
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../..)
 target_link_options_shared_lib(executorch)
 
 add_library(executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ find_package(gflags REQUIRED)`
`78`	`78`	`#`
`79`	`79`
`80`	`80`	# find `executorch` libraries Same as for gflags
`81`		`-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)`
	`81`	`+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..)`
`82`	`82`	`find_package(executorch CONFIG REQUIRED)`
`83`	`83`	`target_link_options_shared_lib(executorch)`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ find_package(gflags REQUIRED)`
`76`	`76`	`#`
`77`	`77`
`78`	`78`	# find `executorch` libraries Same as for gflags
`79`		`-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)`
	`79`	`+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..)`
`80`	`80`	`find_package(executorch CONFIG REQUIRED)`
`81`	`81`	`target_link_options_shared_lib(executorch)`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ set(EXECUTORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")`
`24`	`24`	`set(_common_include_directories`
`25`	`25`	`${EXECUTORCH_ROOT}/.. ${EXECUTORCH_ROOT}/runtime/core/portable_type/c10`
`26`	`26`	`)`
`27`		`-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/cmake/ExecuTorch)`
	`27`	`+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../../..)`
`28`	`28`	`find_package(executorch CONFIG REQUIRED)`
`29`	`29`
`30`	`30`	`target_link_options_shared_lib(executorch)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ set_target_properties(fbjni PROPERTIES`
`60`	`60`	`IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni/prefab/modules/fbjni/libs/android.${ANDROID_ABI}/libfbjni.so"`
`61`	`61`	`)`
`62`	`62`
`63`		`-set(executorch_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../lib/cmake/ExecuTorch)`
	`63`	`+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/../..)`
`64`	`64`	`target_link_options_shared_lib(executorch)`
`65`	`65`
`66`	`66`	`add_library(executorch_jni SHARED jni/jni_layer.cpp jni/log.cpp jni/jni_layer_runtime.cpp)`