diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-04-26 22:32:47 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-05-04 07:47:08 +0200 |
| commit | 003dfb869527b3de81f65b3ad59cd50dd1221188 (patch) | |
| tree | d1ef03b6d482c0aacca0a705776bd7d25c19bdf4 /tools | |
| parent | afb149b86605538919374c185982eca8412e81c9 (diff) | |
[jenkins/cmake] Adapt addon installation
CMake builds out of tree, hence we need to install the addons to
build/addons so that they can be packaged together. Since they are
built before Kodi, don't fail the build when the build directory
exists.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildsteps/osx64/make-binary-addons | 8 | ||||
| -rw-r--r-- | tools/depends/target/cmakebuildsys/Makefile | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/buildsteps/osx64/make-binary-addons b/tools/buildsteps/osx64/make-binary-addons index b27b07ddf6..1625f933d1 100755 --- a/tools/buildsteps/osx64/make-binary-addons +++ b/tools/buildsteps/osx64/make-binary-addons @@ -15,7 +15,13 @@ then do echo "building $addon" git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon - cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 || ALL_BINARY_ADDONS_BUILT="0" + + if [ "$CMAKE_BUILD" = true ]; then + INSTALL_PREFIX="../../../../../build/addons/" + else + INSTALL_PREFIX="../../../../../addons/" + fi + cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 INSTALL_PREFIX="$INSTALL_PREFIX" || ALL_BINARY_ADDONS_BUILT="0" done fi diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile index a51c80109c..60a88e153d 100644 --- a/tools/depends/target/cmakebuildsys/Makefile +++ b/tools/depends/target/cmakebuildsys/Makefile @@ -4,7 +4,7 @@ VERSION.TXT := $(XBMCROOT)/version.txt APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT)) all: - mkdir $(XBMCROOT)/build + mkdir -p $(XBMCROOT)/build cd $(XBMCROOT)/build; $(CMAKE) $(XBMCROOT)/project/cmake clean: |