diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-30 09:49:02 +0000 |
|---|---|---|
| committer | James Thomas <james.thomas@codethink.co.uk> | 2014-10-04 15:56:22 +0000 |
| commit | d352bbd0cd39b1ea31474949d9317a770a41c6ca (patch) | |
| tree | 4be9ed452f35c8c7cade471360c7b6d4a8cdf53e | |
| parent | db91168f03152ce734a0fd21b6ef148ef1bbc389 (diff) | |
| download | definitions-d352bbd0cd39b1ea31474949d9317a770a41c6ca.tar.gz | |
Web and Qt HMI
Conflicts:
strata/genivi-smartdevicelink.morph
strata/genivi-smartdevicelink/smartdevicelink-qt.morph
| -rw-r--r-- | strata/genivi-smartdevicelink.morph | 21 | ||||
| -rw-r--r-- | strata/genivi-smartdevicelink/smartdevicelink-qt.morph (renamed from strata/genivi-smartdevicelink/smartdevicelink.morph) | 2 | ||||
| -rw-r--r-- | strata/genivi-smartdevicelink/smartdevicelink-web.morph | 10 |
3 files changed, 25 insertions, 8 deletions
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph index 6dfb3496..ea477f34 100644 --- a/strata/genivi-smartdevicelink.morph +++ b/strata/genivi-smartdevicelink.morph @@ -25,10 +25,17 @@ chunks: build-depends: - libapr-tarball - libapr-util-tarball -#- name: smartdevicelink -# morph: strata/genivi-smartdevicelink/smartdevicelink.morph -# repo: upstream:smartdevicelink -# ref: ct-mcr-1/danielsilverstone/jetson-genivi -# unpetrify-ref: 5a59c031430712fe270e72e8521866193c27fa56 -# build-depends: -# - log4cxx +- name: smartdevicelink-qt + morph: strata/genivi-smartdevicelink/smartdevicelink-qt.morph + repo: upstream:smartdevicelink + ref: ct-mcr-1/danielsilverstone/smartdevicelink + unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi + build-depends: + - log4cxx +- name: smartdevicelink-web + morph: strata/genivi-smartdevicelink/smartdevicelink-web.morph + repo: upstream:smartdevicelink + ref: ct-mcr-1/danielsilverstone/smartdevicelink + unpetrify-ref: ct-mcr-1/danielsilverstone/jetson-genivi + build-depends: + - log4cxx diff --git a/strata/genivi-smartdevicelink/smartdevicelink.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph index 1ab5cada..65de97e3 100644 --- a/strata/genivi-smartdevicelink/smartdevicelink.morph +++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph @@ -2,7 +2,7 @@ name: smartdevicelink kind: chunk configure-commands: - - cmake -D HMI2=ON . + - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" . build-commands: - make install-commands: diff --git a/strata/genivi-smartdevicelink/smartdevicelink-web.morph b/strata/genivi-smartdevicelink/smartdevicelink-web.morph new file mode 100644 index 00000000..736f9ffc --- /dev/null +++ b/strata/genivi-smartdevicelink/smartdevicelink-web.morph @@ -0,0 +1,10 @@ +name: smartdevicelink +kind: chunk + +configure-commands: + - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" . +build-commands: + - make +install-commands: + - make install DESTDIR="$DESTDIR" + - rm -rf "$DESTDIR/$(pwd)" |