Skip to content

Commit

Permalink
Enable building specific cmake targets (#3759)
Browse files Browse the repository at this point in the history
Summary: Pull Request resolved: facebookincubator/velox#3759

Reviewed By: chadaustin

Differential Revision: D42551680

fbshipit-source-id: 4e5c5bef2ad2997e04ab8fb8db4ef7fbeda0bcab
  • Loading branch information
somasun authored and facebook-github-bot committed Jan 20, 2023
1 parent f9a6b9b commit 91a3a47
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
6 changes: 6 additions & 0 deletions build/fbcode_builder/getdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,7 @@ def run_project_cmd(self, args, loader, manifest):
loader,
final_install_prefix=loader.get_project_install_prefix(m),
extra_cmake_defines=extra_cmake_defines,
cmake_target=args.cmake_target if m == manifest else "install",
extra_b2_args=extra_b2_args,
)
builder.build(install_dirs, reconfigure=reconfigure)
Expand Down Expand Up @@ -763,6 +764,11 @@ def setup_project_cmd_parser(self, parser):
'e.g: \'{"CMAKE_CXX_FLAGS": "--bla"}\''
),
)
parser.add_argument(
"--cmake-target",
help=("Target for cmake build."),
default="install",
)
parser.add_argument(
"--extra-b2-args",
help=(
Expand Down
4 changes: 3 additions & 1 deletion build/fbcode_builder/getdeps/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ def __init__(
loader=None,
final_install_prefix=None,
extra_cmake_defines=None,
cmake_target="install",
) -> None:
super(CMakeBuilder, self).__init__(
build_opts,
Expand All @@ -525,6 +526,7 @@ def __init__(
self.defines = defines or {}
if extra_cmake_defines:
self.defines.update(extra_cmake_defines)
self.cmake_target = cmake_target

try:
from .facebook.vcvarsall import extra_vc_cmake_defines
Expand Down Expand Up @@ -707,7 +709,7 @@ def _build(self, install_dirs, reconfigure: bool) -> None:
"--build",
self.build_dir,
"--target",
"install",
self.cmake_target,
"--config",
"Release",
"-j",
Expand Down
3 changes: 2 additions & 1 deletion build/fbcode_builder/getdeps/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ def __init__(self, file_name, fp=None):
# autoconf.args section one per line
config = configparser.RawConfigParser(allow_no_value=True)
config.optionxform = str # make it case sensitive

if fp is None:
with open(file_name, "r") as fp:
config.read_file(fp)
Expand Down Expand Up @@ -469,6 +468,7 @@ def create_builder( # noqa:C901
loader,
final_install_prefix=None,
extra_cmake_defines=None,
cmake_target=None,
extra_b2_args=None,
):
builder = self.get_builder_name(ctx)
Expand Down Expand Up @@ -548,6 +548,7 @@ def create_builder( # noqa:C901
loader,
final_install_prefix,
extra_cmake_defines,
cmake_target,
)

if builder == "python-wheel":
Expand Down

0 comments on commit 91a3a47

Please sign in to comment.