aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/cmake/build/ci
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2020-01-08 13:59:41 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2020-01-08 14:42:05 +0300
commitd5ef1eac7f52771108953599bd821caa03637b0e (patch)
tree64f1e713b7eaf0d8c4a37a768e1ad23a1ba328ce /cmake/build/ci
parentTravis: verify executable file bitness (diff)
downloadcmake-common-d5ef1eac7f52771108953599bd821caa03637b0e.tar.gz
cmake-common-d5ef1eac7f52771108953599bd821caa03637b0e.zip
cmake/build/ci: fix import errors
Diffstat (limited to '')
-rwxr-xr-xcmake/build/ci/appveyor.py9
-rwxr-xr-xcmake/build/ci/travis.py13
2 files changed, 15 insertions, 7 deletions
diff --git a/cmake/build/ci/appveyor.py b/cmake/build/ci/appveyor.py
index 38d0d7e..bb4d31d 100755
--- a/cmake/build/ci/appveyor.py
+++ b/cmake/build/ci/appveyor.py
@@ -15,8 +15,6 @@ import logging
import os
import sys
-from build import build
-
class Image(Enum):
VS_2013 = 'Visual Studio 2013'
@@ -127,8 +125,12 @@ def build_appveyor(argv=None):
args = _parse_args(argv)
_check_appveyor()
+ this_module_dir = os.path.dirname(os.path.abspath(__file__))
+ parent_module_dir = os.path.dirname(this_module_dir)
+ sys.path.insert(1, parent_module_dir)
+ from build import build
+
appveyor_argv = [
- '--src', _get_src_dir(),
'--build', _get_build_dir(),
'--configuration', _get_configuration(),
]
@@ -138,6 +140,7 @@ def build_appveyor(argv=None):
]
appveyor_argv += [
'--',
+ _get_src_dir(),
'-G', _get_generator(),
'-A', _get_platform(),
]
diff --git a/cmake/build/ci/travis.py b/cmake/build/ci/travis.py
index 25dbe70..3712bf9 100755
--- a/cmake/build/ci/travis.py
+++ b/cmake/build/ci/travis.py
@@ -15,8 +15,6 @@ import os
import os.path
import sys
-from build import build
-
def _env(name):
if name not in os.environ:
@@ -64,8 +62,12 @@ def build_travis(argv=None):
args = _parse_args(argv)
_check_travis()
+ this_module_dir = os.path.dirname(os.path.abspath(__file__))
+ parent_module_dir = os.path.dirname(this_module_dir)
+ sys.path.insert(1, parent_module_dir)
+ from build import build
+
travis_argv = [
- '--src', _get_src_dir(),
'--build', _get_build_dir(),
'--configuration', _get_configuration(),
]
@@ -73,7 +75,10 @@ def build_travis(argv=None):
travis_argv += [
'--install', args.install_dir,
]
- travis_argv.append('--')
+ travis_argv += [
+ '--',
+ _get_src_dir(),
+ ]
build(travis_argv + args.cmake_args)