diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-05-26 17:49:50 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2020-05-26 18:27:40 -0400 |
commit | 89edd734c0a347dafceba1cef1ac835e0fe61e1a (patch) | |
tree | d54ef3bc130749b9c4241f22663b508c697af9f5 /CMakeLists.txt | |
parent | 055909f4a7b27003bdd60c1cee764cf1d23be9cc (diff) |
Fix CMake files and non-debug crashes
Changes include:
- Reworked src/CMakeLists.txt to use app template macros.
- Removed now unnecessary linker script, symbol exports are handled
in the app template macros.
- Set missing required entries in conf.d/cmake/config.cmake, and
update to match latest template version in cmake-apps-module,
as well as some naming fixes in the PROJECT* definitions.
- Move project definition to top-level CMakeLists.txt to make
tracking conf.d/cmake/config.cmake changes easier. This quiets
the warning from newer versions of CMake about needing a project
definition in the top-level CMakeLists.txt.
- Moved icon file to default location for app template.
- Added config.xml.in file to work with app template, replacing
previous hard-coded version.
- Fixed some issues in src/hs-clientmanager.{h,cpp} to address
crashes seen in the release widget now that it is actually built
without debug flags, and to quiet some warnings.
Bug-AGL: SPEC-3343
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I3741e6a307297272d5c22e894dfa9ff8b0dd1f52
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe99ce..097c17c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ # # Copyright (c) 2017 TOYOTA MOTOR CORPORATION +# Copyright (C) 2020 Konsulko Group # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +15,8 @@ # limitations under the License. # +project(HomeScreenService) + CMAKE_MINIMUM_REQUIRED(VERSION 3.3) include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake) |