lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-10 05:22:59 +03:00
Code Activity

allow specifying the directory containing CMakeLists.txt

Browse Source 
Summary:
Update `cmake_configure()`, `cmake_install()`, and `fb_github_cmake_install()`
to support specifying the directory where CMakeLists.txt is found, relative to
the directory where the build is being performed.  Previously these functions
where hardcoded to assume that CMakeLists.txt was always found at '..'

Reviewed By: snarkmaster

Differential Revision: D7540689

fbshipit-source-id: efd3d044345fadc0346e436c01d0a247e1b6fd70
This commit is contained in:
Adam Simpkins
2018-04-10 12:15:52 -07:00
committed by Facebook Github Bot
parent 98f458bdaf
commit a277c46e59
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/fbcode_builder/fbcode_builder.py
View File

@@ -332,7 +332,7 @@ class FBCodeBuilder(object):
self.run(ShellQuoted('autoreconf -ivf')), self.run(ShellQuoted('autoreconf -ivf')),
] + self.configure() + self.make_and_install()) ] + self.configure() + self.make_and_install())
def cmake_configure(self, name): def cmake_configure(self, name, cmake_path='..'):
cmake_defines = { cmake_defines = {
'BUILD_SHARED_LIBS': 'ON', 'BUILD_SHARED_LIBS': 'ON',
'CMAKE_INSTALL_PREFIX': self.option('prefix'), 'CMAKE_INSTALL_PREFIX': self.option('prefix'),
@@ -344,19 +344,22 @@ class FBCodeBuilder(object):
self.run(ShellQuoted( self.run(ShellQuoted(
'CXXFLAGS="$CXXFLAGS -fPIC -isystem "{p}"/include" ' 'CXXFLAGS="$CXXFLAGS -fPIC -isystem "{p}"/include" '
'CFLAGS="$CFLAGS -fPIC -isystem "{p}"/include" ' 'CFLAGS="$CFLAGS -fPIC -isystem "{p}"/include" '
'cmake {args} ..' 'cmake {args} {cmake_path}'
).format( ).format(
p=self.option('prefix'), p=self.option('prefix'),
args=shell_join(' ', ( args=shell_join(' ', (
ShellQuoted('-D{k}={v}').format(k=k, v=v) ShellQuoted('-D{k}={v}').format(k=k, v=v)
for k, v in cmake_defines.items() for k, v in cmake_defines.items()
)), )),
cmake_path=cmake_path,
)), )),
] ]
def cmake_install(self, name): def cmake_install(self, name, cmake_path='..'):
return self.step('Build and install {0}'.format(name), return self.step(
self.cmake_configure(name) + self.make_and_install()) 'Build and install {0}'.format(name),
self.cmake_configure(name, cmake_path) + self.make_and_install()
)
def fb_github_autoconf_install(self, project_and_path): def fb_github_autoconf_install(self, project_and_path):
return [ return [
@@ -364,8 +367,8 @@ class FBCodeBuilder(object):
self.autoconf_install(project_and_path), self.autoconf_install(project_and_path),
] ]
def fb_github_cmake_install(self, project_and_path): def fb_github_cmake_install(self, project_and_path, cmake_path='..'):
return [ return [
self.fb_github_project_workdir(project_and_path), self.fb_github_project_workdir(project_and_path),
self.cmake_install(project_and_path), self.cmake_install(project_and_path, cmake_path),
] ]