diff --git a/.gitignore b/.gitignore index df2f66ea93..4771a116f9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /.nobuckcheck /buck-out /external +# cmake +/_build diff --git a/CMake/EdenConfigChecks.cmake b/CMake/EdenConfigChecks.cmake index 2485cf6705..c9cf3134bf 100644 --- a/CMake/EdenConfigChecks.cmake +++ b/CMake/EdenConfigChecks.cmake @@ -9,7 +9,8 @@ find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) find_package(FBThrift CONFIG REQUIRED) -find_package(Yarpl MODULE REQUIRED) +find_package(yarpl CONFIG REQUIRED) +find_package(rsocket CONFIG REQUIRED) find_package(GMock MODULE REQUIRED) find_package(OpenSSL MODULE REQUIRED) diff --git a/CMake/FindYarpl.cmake b/CMake/FindYarpl.cmake deleted file mode 100644 index abd2e0351b..0000000000 --- a/CMake/FindYarpl.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# -# - Try to find the Facebook YARPL library -# This will define -# Yarpl_FOUND -# YARPL_INCLUDE_DIR -# YARPL_LIBRARIES -# - -find_path(YARPL_INCLUDE_DIRS yarpl/Flowable.h) -find_library(YARPL_LIBRARIES yarpl) -mark_as_advanced(YARPL_INCLUDE_DIRS YARPL_LIBRARIES) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Yarpl YARPL_INCLUDE_DIRS YARPL_LIBRARIES) diff --git a/eden/.gitignore b/eden/.gitignore new file mode 100644 index 0000000000..f914f96ae0 --- /dev/null +++ b/eden/.gitignore @@ -0,0 +1,6 @@ +CMakeFiles +CMakeCache.txt +Makefile +cmake_install.cmake +gen-cpp2 +lib*.a diff --git a/getdeps.py b/getdeps.py index c04e486953..89ca35e3d3 100755 --- a/getdeps.py +++ b/getdeps.py @@ -383,9 +383,6 @@ def install_platform_deps(): "zstd", ] ) - run_cmd(["brew", "tap", "homebrew/cask"]) - run_cmd(["brew", "cask", "install", "osxfuse"]) - else: # TODO: Handle distributions other than Ubuntu. raise Exception(