diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/ci/appveyor/cmake.py | 3 | ||||
| -rw-r--r-- | project/ci/travis/cmake.py | 3 | ||||
| -rw-r--r-- | project/cmake/build.py | 31 |
3 files changed, 35 insertions, 2 deletions
diff --git a/project/ci/appveyor/cmake.py b/project/ci/appveyor/cmake.py index c1b851c..b720f6b 100644 --- a/project/ci/appveyor/cmake.py +++ b/project/ci/appveyor/cmake.py @@ -105,6 +105,8 @@ def _parse_args(argv=None): parser.add_argument('--install', metavar='DIR', dest='install_dir', help='install directory') + parser.add_argument('--boost', metavar='DIR', dest='boost_dir', + help='set Boost directory path') parser.add_argument('cmake_args', nargs='*', metavar='CMAKE_ARG', default=[], help='additional CMake arguments, to be passed verbatim') return parser.parse_args(argv) @@ -122,6 +124,7 @@ def build_appveyor(argv=None): install_dir=args.install_dir, platform=_get_platform(), configuration=_get_configuration(), + boost_dir=args.boost_dir, cmake_args=cmake_args) build(params) diff --git a/project/ci/travis/cmake.py b/project/ci/travis/cmake.py index 47177bc..2814e41 100644 --- a/project/ci/travis/cmake.py +++ b/project/ci/travis/cmake.py @@ -61,6 +61,8 @@ def _parse_args(argv=None): parser.add_argument('--install', metavar='DIR', dest='install_dir', help='install directory') + parser.add_argument('--boost', metavar='DIR', dest='boost_dir', + help='set Boost directory path') parser.add_argument('cmake_args', nargs='*', metavar='CMAKE_ARG', default=[], help='additional CMake arguments, to be passed verbatim') return parser.parse_args(argv) @@ -75,6 +77,7 @@ def build_travis(argv=None): install_dir=args.install_dir, platform=_get_platform(), configuration=_get_configuration(), + boost_dir=args.boost_dir, cmake_args=args.cmake_args) build(params) diff --git a/project/cmake/build.py b/project/cmake/build.py index 5127c3d..e683eff 100644 --- a/project/cmake/build.py +++ b/project/cmake/build.py @@ -43,11 +43,13 @@ def run_cmake(cmake_args): class GenerationPhase: def __init__(self, src_dir, build_dir, install_dir=None, platform=None, configuration=DEFAULT_CONFIGURATION, - mingw=False, cmake_args=None): + boost_dir=None, mingw=False, cmake_args=None): src_dir = normalize_path(src_dir) build_dir = normalize_path(build_dir) if install_dir is not None: install_dir = normalize_path(install_dir) + if boost_dir is not None: + boost_dir = normalize_path(boost_dir) cmake_args = cmake_args or [] self.src_dir = src_dir @@ -55,6 +57,7 @@ class GenerationPhase: self.install_dir = install_dir self.platform = platform self.configuration = configuration + self.boost_dir = boost_dir self.mingw = mingw self.cmake_args = cmake_args @@ -64,10 +67,26 @@ class GenerationPhase: result += ['-D', f'CMAKE_INSTALL_PREFIX={self.install_dir}'] result += toolchain.get_cmake_args() result += ['-D', f'CMAKE_BUILD_TYPE={self.configuration}'] + result += self._get_boost_args() result += self.cmake_args result += [f'-B{self.build_dir}', f'-H{self.src_dir}'] return result + def _get_boost_args(self): + if self.boost_dir is None: + return [] + stagedir = self._stagedir(self.boost_dir, self.platform, self.configuration) + return [ + '-D', f'BOOST_ROOT={self.boost_dir}', + '-D', f'BOOST_LIBRARYDIR={stagedir}', + ] + + @staticmethod + def _stagedir(boost_dir, platform, configuration): + if platform is None: + platform = Platform.native() + return os.path.join(boost_dir, 'stage', str(platform), str(configuration), 'lib') + def run(self): with Toolchain.detect(self.platform, self.build_dir, mingw=self.mingw) as toolchain: run_cmake(self._cmake_args(toolchain)) @@ -97,13 +116,15 @@ class BuildPhase: class BuildParameters: def __init__(self, src_dir, build_dir=None, install_dir=None, platform=None, configuration=DEFAULT_CONFIGURATION, - mingw=False, cmake_args=None): + boost_dir=None, mingw=False, cmake_args=None): src_dir = normalize_path(src_dir) if build_dir is not None: build_dir = normalize_path(build_dir) if install_dir is not None: install_dir = normalize_path(install_dir) + if boost_dir is not None: + boost_dir = normalize_path(boost_dir) cmake_args = cmake_args or [] self.src_dir = src_dir @@ -111,6 +132,7 @@ class BuildParameters: self.install_dir = install_dir self.platform = platform self.configuration = configuration + self.boost_dir = boost_dir self.mingw = mingw self.cmake_args = cmake_args @@ -140,6 +162,7 @@ def build(params): install_dir=params.install_dir, platform=params.platform, configuration=params.configuration, + boost_dir=params.boost_dir, mingw=params.mingw, cmake_args=params.cmake_args) gen_phase.run() @@ -174,6 +197,10 @@ def _parse_args(argv=None): type=Configuration.parse, default=DEFAULT_CONFIGURATION, help=f'build configuration ({configuration_options})') + parser.add_argument('--boost', metavar='DIR', dest='boost_dir', + type=normalize_path, + help='set Boost directory path') + parser.add_argument('--mingw', action='store_true', help='build using MinGW-w64') |