diff options
| author | Simon Rettberg | 2017-12-15 14:40:26 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-15 14:40:26 +0100 |
| commit | 1517b96229ad4ce635e093bcc6b26712dcbc5d10 (patch) | |
| tree | 929d4d9fb6c896b94c65c68faf54392ccb9e78b9 /core/modules/beamergui/module.build | |
| parent | [run-virt] Support %loginuser% in netshares (diff) | |
| download | mltk-1517b96229ad4ce635e093bcc6b26712dcbc5d10.tar.gz mltk-1517b96229ad4ce635e093bcc6b26712dcbc5d10.tar.xz mltk-1517b96229ad4ce635e093bcc6b26712dcbc5d10.zip | |
[beamergui] cmake now, fix greps in setup
Diffstat (limited to 'core/modules/beamergui/module.build')
| -rw-r--r-- | core/modules/beamergui/module.build | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/modules/beamergui/module.build b/core/modules/beamergui/module.build index db1bc6a4..e47758cc 100644 --- a/core/modules/beamergui/module.build +++ b/core/modules/beamergui/module.build @@ -6,16 +6,11 @@ fetch_source() { build() { local SRCDIR="${MODULE_WORK_DIR}/src/" - QMAKE="$(which qmake-qt5)" - [ -z "$QMAKE" ] && QMAKE=qmake - - # first activate qt 5 - activate_qt 5 mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!" - pinfo "Running qmake" - "$QMAKE" "$SRCDIR/src/beamergui.pro" -r -spec linux-g++ || perror "'$QMAKE' failed (e.g. not installed)." + pinfo "Running cmake" + cmake "$SRCDIR" || perror "'$QMAKE' failed (e.g. not installed)." pinfo "Running make" make || perror "'make' failed." |