mirror of
https://github.com/facebook/sapling.git
synced 2024-09-11 10:36:52 +03:00
eden: wire up mac contbuild
Summary: Make `build-oss.sh` actually run the cmake build. At the moment this is only run from nbtd for mac platforms, so that is all that I've tested with it. This is similar to the the equivalent scripts for watchman. In a later diff we can centralize and clean up the duplication. Reviewed By: simpkins Differential Revision: D13910031 fbshipit-source-id: 6a7250c22033e913d999cf928fed27dada0647ef
This commit is contained in:
parent
cd5b4b6d92
commit
1752348eef
2
.gitignore
vendored
2
.gitignore
vendored
@ -5,3 +5,5 @@
|
||||
/.nobuckcheck
|
||||
/buck-out
|
||||
/external
|
||||
# cmake
|
||||
/_build
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
6
eden/.gitignore
vendored
Normal file
6
eden/.gitignore
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
CMakeFiles
|
||||
CMakeCache.txt
|
||||
Makefile
|
||||
cmake_install.cmake
|
||||
gen-cpp2
|
||||
lib*.a
|
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user