diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2019-12-15 13:18:47 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2019-12-15 13:27:48 -0500 |
| commit | b0031ca743932724fb4c779345bd6177a571edf5 (patch) | |
| tree | 099c8f3c36560959ecb3d6e7c5a603566ad642f3 /app/CMakeLists.txt | |
| parent | c0259ca64531f30911328be4277685f76a815af9 (diff) | |
Updates to fix building with SDK and remove submodule usagehalibut_8.0.4halibut/8.0.48.0.4
Update the autobuild script and CMake files to work with the SDK, and
remove now deprecated usage of the app-templates submodule.
Bug-AGL: SPEC-3055
Change-Id: Ib01f46fa510df2614021a8f256ab09fdcff8871a
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/CMakeLists.txt')
| -rw-r--r-- | app/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 07c60c4..9547426 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2018 Konsulko Group +# Copyright 2018,2019 Konsulko Group # # Author: Scott Murray <scott.murray@konsulko.com> # @@ -18,7 +18,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS}) find_package(Qt5 COMPONENTS Core Gui QuickControls2 WebSockets QuickWidgets REQUIRED) find_package(PkgConfig REQUIRED) |