1
0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-07 07:02:53 +03:00

Enable building specific cmake targets (#3759)

Summary: Pull Request resolved: https://github.com/facebookincubator/velox/pull/3759

Reviewed By: chadaustin

Differential Revision: D42551680

fbshipit-source-id: 4e5c5bef2ad2997e04ab8fb8db4ef7fbeda0bcab
This commit is contained in:
Manikandan Somasundaram
2023-01-19 18:03:58 -08:00
committed by Facebook GitHub Bot
parent fbc461102e
commit 730dad1340
3 changed files with 11 additions and 2 deletions

View File

@@ -622,6 +622,7 @@ class BuildCmd(ProjectCmdBase):
loader, loader,
final_install_prefix=loader.get_project_install_prefix(m), final_install_prefix=loader.get_project_install_prefix(m),
extra_cmake_defines=extra_cmake_defines, extra_cmake_defines=extra_cmake_defines,
cmake_target=args.cmake_target if m == manifest else "install",
extra_b2_args=extra_b2_args, extra_b2_args=extra_b2_args,
) )
builder.build(install_dirs, reconfigure=reconfigure) builder.build(install_dirs, reconfigure=reconfigure)
@@ -763,6 +764,11 @@ class BuildCmd(ProjectCmdBase):
'e.g: \'{"CMAKE_CXX_FLAGS": "--bla"}\'' 'e.g: \'{"CMAKE_CXX_FLAGS": "--bla"}\''
), ),
) )
parser.add_argument(
"--cmake-target",
help=("Target for cmake build."),
default="install",
)
parser.add_argument( parser.add_argument(
"--extra-b2-args", "--extra-b2-args",
help=( help=(

View File

@@ -512,6 +512,7 @@ if __name__ == "__main__":
loader=None, loader=None,
final_install_prefix=None, final_install_prefix=None,
extra_cmake_defines=None, extra_cmake_defines=None,
cmake_target="install",
) -> None: ) -> None:
super(CMakeBuilder, self).__init__( super(CMakeBuilder, self).__init__(
build_opts, build_opts,
@@ -525,6 +526,7 @@ if __name__ == "__main__":
self.defines = defines or {} self.defines = defines or {}
if extra_cmake_defines: if extra_cmake_defines:
self.defines.update(extra_cmake_defines) self.defines.update(extra_cmake_defines)
self.cmake_target = cmake_target
try: try:
from .facebook.vcvarsall import extra_vc_cmake_defines from .facebook.vcvarsall import extra_vc_cmake_defines
@@ -707,7 +709,7 @@ if __name__ == "__main__":
"--build", "--build",
self.build_dir, self.build_dir,
"--target", "--target",
"install", self.cmake_target,
"--config", "--config",
"Release", "Release",
"-j", "-j",

View File

@@ -203,7 +203,6 @@ class ManifestParser(object):
# autoconf.args section one per line # autoconf.args section one per line
config = configparser.RawConfigParser(allow_no_value=True) config = configparser.RawConfigParser(allow_no_value=True)
config.optionxform = str # make it case sensitive config.optionxform = str # make it case sensitive
if fp is None: if fp is None:
with open(file_name, "r") as fp: with open(file_name, "r") as fp:
config.read_file(fp) config.read_file(fp)
@@ -469,6 +468,7 @@ class ManifestParser(object):
loader, loader,
final_install_prefix=None, final_install_prefix=None,
extra_cmake_defines=None, extra_cmake_defines=None,
cmake_target=None,
extra_b2_args=None, extra_b2_args=None,
): ):
builder = self.get_builder_name(ctx) builder = self.get_builder_name(ctx)
@@ -548,6 +548,7 @@ class ManifestParser(object):
loader, loader,
final_install_prefix, final_install_prefix,
extra_cmake_defines, extra_cmake_defines,
cmake_target,
) )
if builder == "python-wheel": if builder == "python-wheel":