diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-03-01 22:14:04 +0100 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-03-06 22:00:41 +0100 |
| commit | ff6892bd85949e509432e715e396ad1e07e08325 (patch) | |
| tree | 7b62ef638c0d6040350e552379df72a4c5e5288a /tools/buildsteps/rbpi | |
| parent | d8bbef50f20395ca6000c2671a80582b3bc6eec3 (diff) | |
[jenkins] Optionally build with CMake
- Add CMAKE_BUILD variable that defines if CMake should be used
to build the main application.
- Use variable to build with CMake (GNU Makefile Generator) on
supported platforms: android, ios, osx, linux, rbpi.
Diffstat (limited to 'tools/buildsteps/rbpi')
| -rwxr-xr-x | tools/buildsteps/rbpi/configure-xbmc | 8 | ||||
| -rwxr-xr-x | tools/buildsteps/rbpi/make-xbmc | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/buildsteps/rbpi/configure-xbmc b/tools/buildsteps/rbpi/configure-xbmc index a0699e674b..506fc617fd 100755 --- a/tools/buildsteps/rbpi/configure-xbmc +++ b/tools/buildsteps/rbpi/configure-xbmc @@ -2,5 +2,9 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=rbpi . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE -make -C tools/buildsteps/rbpi -f config-xbmc-makefile +if [ "$CMAKE_BUILD" = true ]; then + make -C $WORKSPACE/tools/depends/target/cmakebuildsys +else + cd $WORKSPACE + make -C tools/buildsteps/rbpi -f config-xbmc-makefile +fi diff --git a/tools/buildsteps/rbpi/make-xbmc b/tools/buildsteps/rbpi/make-xbmc index 5ce9c6a4bd..e01df1a9c5 100755 --- a/tools/buildsteps/rbpi/make-xbmc +++ b/tools/buildsteps/rbpi/make-xbmc @@ -2,4 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=rbpi . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE;make -j$BUILDTHREADS || make +if [ "$CMAKE_BUILD" = true ]; then + cd $WORKSPACE/build;make -j$BUILDTHREADS || make +else + cd $WORKSPACE;make -j$BUILDTHREADS || make +fi |