Use symlink to make BUCK happy

Author: larryliu0820

.gitignore

@@ -21,7 +21,7 @@ ethos-u-scratch/
 executorch.egg-info
 pip-out/
 
-# Dynamically fetched third-party libraries
+# Third-party libraries, symlink'ed to FetchContent source directories
 third-party/gflags
 
 # Any exported models and profiling outputs

CMakeLists.txt

@@ -52,7 +52,7 @@ project(executorch)
 
 include(${PROJECT_SOURCE_DIR}/tools/cmake/common/preset.cmake)
 include(${PROJECT_SOURCE_DIR}/tools/cmake/Utils.cmake)
-include(${PROJECT_SOURCE_DIR}/tools/cmake/EXECUTORCH_FetchContent_Destination.cmake)
+include(${PROJECT_SOURCE_DIR}/tools/cmake/FetchContent.cmake)
 include(CMakeDependentOption)
 include(ExternalProject)
 include(FetchContent)

examples/models/llama/CMakeLists.txt

@@ -47,6 +47,7 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(TORCH_ROOT ${EXECUTORCH_ROOT}/third-party/pytorch)
 
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
+include(${EXECUTORCH_ROOT}/tools/cmake/FetchContent.cmake)
 
 if(NOT PYTHON_EXECUTABLE)
   resolve_python_executable()
@@ -68,10 +69,8 @@ set(_common_compile_options -Wno-deprecated-declarations -fPIC)
 # Let files say "include <executorch/path/to/header.h>".
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
-# For some reason android build is not able to find where gflags is and hence
-# cannot find corresponding .cmake file
-set(gflags_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../third-party/gflags/gflags-build)
-find_package(gflags REQUIRED)
+# Fetch gflags
+FetchContent_gflags()
 
 #
 # llama_main: test binary to run llama, with tokenizer and sampler integrated

examples/models/llava/CMakeLists.txt

@@ -45,6 +45,7 @@ endif()
 set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
+include(${EXECUTORCH_ROOT}/tools/cmake/FetchContent.cmake)
 
 if(NOT PYTHON_EXECUTABLE)
   resolve_python_executable()
@@ -66,10 +67,8 @@ set(_common_compile_options -Wno-deprecated-declarations -fPIC)
 # Let files say "include <executorch/path/to/header.h>".
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
-# For some reason android build is not able to find where gflags is and hence
-# cannot find corresponding .cmake file
-set(gflags_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../../third-party/gflags/gflags-build)
-find_package(gflags REQUIRED)
+# Fetch gflags
+FetchContent_gflags()
 
 #
 # llava_main: test binary to run llava, with tokenizer and sampler integrated

examples/portable/custom_ops/CMakeLists.txt

@@ -29,6 +29,7 @@ endif()
 
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
+include(${EXECUTORCH_ROOT}/tools/cmake/FetchContent.cmake)
 
 if(NOT PYTHON_EXECUTABLE)
   resolve_python_executable()
@@ -40,8 +41,7 @@ set(_common_compile_options -Wno-deprecated-declarations -fPIC)
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
 find_package(executorch CONFIG REQUIRED)
-set(gflags_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../third-party/gflags/gflags-build)
-find_package(gflags REQUIRED)
+FetchContent_gflags()
 
 target_include_directories(executorch INTERFACE ${_common_include_directories})
 

examples/qualcomm/CMakeLists.txt

@@ -31,9 +31,6 @@ endif()
 find_package(executorch CONFIG REQUIRED)
 target_compile_options(executorch INTERFACE -DET_EVENT_TRACER_ENABLED)
 
-set(gflags_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../third-party/gflags/gflags-build)
-find_package(gflags REQUIRED)
-
 set(_common_compile_options -Wno-deprecated-declarations -fPIC)
 
 # Let files say "include <executorch/path/to/header.h>".

examples/selective_build/CMakeLists.txt

@@ -23,6 +23,7 @@ set(TORCH_ROOT ${EXECUTORCH_ROOT}/third-party/pytorch)
 
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 include(${EXECUTORCH_ROOT}/tools/cmake/Codegen.cmake)
+include(${EXECUTORCH_ROOT}/tools/cmake/FetchContent.cmake)
 
 if(NOT PYTHON_EXECUTABLE)
   resolve_python_executable()
@@ -39,8 +40,7 @@ set(_common_compile_options -Wno-deprecated-declarations -fPIC)
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
 find_package(executorch CONFIG REQUIRED)
-set(gflags_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../third-party/gflags/gflags-build)
-find_package(gflags REQUIRED)
+FetchContent_gflags()
 
 target_include_directories(executorch_core INTERFACE ${_common_include_directories})
 

extension/training/CMakeLists.txt

@@ -31,6 +31,7 @@ target_link_libraries(extension_training executorch_core kernels_util_all_deps
 
 list(TRANSFORM _train_xor__srcs PREPEND "${EXECUTORCH_ROOT}/")
 add_executable(train_xor ${_train_xor__srcs})
+
 target_include_directories(
   train_xor PUBLIC ${_common_include_directories}
 )

third-party/CMakeLists.txt

@@ -14,14 +14,12 @@ if(BUILD_TESTING)
   add_subdirectory(googletest)
 endif()
 
-EXECUTORCH_FetchContent_Destination("${CMAKE_CURRENT_SOURCE_DIR}/gflags")
-FetchContent_Declare(
-  gflags
-  GIT_REPOSITORY https://github.com/gflags/gflags.git
-  GIT_TAG v2.2.2
+FetchContent_gflags()
+# Create a symlink from the gflags source directory to third-party/gflags
+message(STATUS "gflags source dir: ${gflags_SOURCE_DIR}")
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E create_symlink "${gflags_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/gflags"
 )
-set(GFLAGS_INTTYPES_FORMAT C99)
-FetchContent_MakeAvailable(gflags)
 
 # MARK: - flatbuffers
 

third-party/gflags_defs.bzl

@@ -1,9 +1,4 @@
 # ------------------------------------------------------------------------------
-
-# gflags is materialized during build time by cmake. See third-party/CMakeLists.txt.
-def _path(relative_path):
-    return "gflags/gflags-src/{}".format(relative_path)
-
 # Add native rules to configure source files
 # Not tested for building on windows platforms
 def gflags_sources(namespace = ["google", "gflags"]):
@@ -12,7 +7,7 @@ def gflags_sources(namespace = ["google", "gflags"]):
     # @lint-ignore BUCKLINT: native and fb_native are explicitly forbidden in fbcode.
     native.genrule(
         name = "gflags_declare_h",
-        srcs = [_path("src/gflags_declare.h.in")],
+        srcs = ["gflags/src/gflags_declare.h.in"],
         out = "gflags/gflags_declare.h",
         cmd = (common_preamble + "awk '{ " +
                "gsub(/@GFLAGS_NAMESPACE@/, \"" + namespace[0] + "\"); " +
@@ -27,7 +22,7 @@ def gflags_sources(namespace = ["google", "gflags"]):
         # @lint-ignore BUCKLINT: native and fb_native are explicitly forbidden in fbcode.
         native.genrule(
             name = gflags_ns_h_file.replace(".", "_"),
-            srcs = [_path("src/gflags_ns.h.in")],
+            srcs = ["gflags/src/gflags_ns.h.in"],
             out = "gflags/" + gflags_ns_h_file,
             cmd = (common_preamble + "awk '{ " +
                    "gsub(/@ns@/, \"" + ns + "\"); " +
@@ -39,7 +34,7 @@ def gflags_sources(namespace = ["google", "gflags"]):
     # @lint-ignore BUCKLINT: native and fb_native are explicitly forbidden in fbcode.
     native.genrule(
         name = "gflags_h",
-        srcs = [_path("src/gflags.h.in")],
+        srcs = ["gflags/src/gflags.h.in"],
         out = "gflags/gflags.h",
         cmd = (common_preamble + "awk '{ " +
                "gsub(/@GFLAGS_ATTRIBUTE_UNUSED@/, \"\"); " +
@@ -50,15 +45,15 @@ def gflags_sources(namespace = ["google", "gflags"]):
     # @lint-ignore BUCKLINT: native and fb_native are explicitly forbidden in fbcode.
     native.genrule(
         name = "gflags_completions_h",
-        srcs = [_path("src/gflags_completions.h.in")],
+        srcs = ["gflags/src/gflags_completions.h.in"],
         out = "gflags/gflags_completions.h",
         cmd = common_preamble + "awk '{ gsub(/@GFLAGS_NAMESPACE@/, \"" + namespace[0] + "\"); print; }' $SRCS > $OUT",
     )
     headers = {
-        "config.h": _path("src/config.h"),
-        "mutex.h": _path("src/mutex.h"),
-        "util.h": _path("src/util.h"),
-        "windows_port.h": _path("src/windows_port.h"),
+        "config.h": "gflags/src/config.h",
+        "mutex.h": "gflags/src/mutex.h",
+        "util.h": "gflags/src/util.h",
+        "windows_port.h": "gflags/src/windows_port.h",
     }
     exported_headers = {
         "gflags/gflags.h": ":gflags_h",
@@ -67,9 +62,9 @@ def gflags_sources(namespace = ["google", "gflags"]):
     }
     exported_headers.update({"gflags/" + hdr: ":" + hdr.replace(".", "_") for hdr in gflags_ns_h_files})
     srcs = [
-        _path("src/gflags.cc"),
-        _path("src/gflags_completions.cc"),
-        _path("src/gflags_reporting.cc"),
+        "gflags/src/gflags.cc",
+        "gflags/src/gflags_completions.cc",
+        "gflags/src/gflags_reporting.cc",
     ]
     return [exported_headers, headers, srcs]