diff options
| author | Sebastien Guiriec <sebastien.guiriec@renault.com> | 2017-05-02 14:19:28 +0200 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2019-03-12 17:49:21 -0700 |
| commit | d5cdd5fb5966ac9d0f06f61b721b8e5fb12d7ee4 (patch) | |
| tree | 525d001b9c50fda88c9d994b527b88aafe14281b /upstream/skeleton-subsystem | |
| parent | 54bdb2158f647a8c8b6af9bc2e2239a6ce7b6bbc (diff) | |
| download | parameter-framework-d5cdd5fb5966ac9d0f06f61b721b8e5fb12d7ee4.tar.gz | |
[PFW] Integrate PFW core version 3.2.7 release
PFW 3.2.7 release notes:
https://github.com/intel/parameter-framework/releases/tag/v3.2.7
This release contains the following changes:
- Tighter checks on XML attributes
- Travis-related changes
- Documentation fixes
- Fix displaying of syntax errors in EDD files
Bug: 124767636
Test: build
Change-Id: I7b2671156b5275aa2b804246fa65e81613677881
Signed-off-by: Sebastien Guiriec <sebastien.guiriec@renault.com>
Diffstat (limited to 'upstream/skeleton-subsystem')
| -rw-r--r-- | upstream/skeleton-subsystem/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | upstream/skeleton-subsystem/SkeletonSubsystem.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/upstream/skeleton-subsystem/CMakeLists.txt b/upstream/skeleton-subsystem/CMakeLists.txt index 4016a41..807a4db 100644 --- a/upstream/skeleton-subsystem/CMakeLists.txt +++ b/upstream/skeleton-subsystem/CMakeLists.txt @@ -26,8 +26,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# working on 2.8.12 - broken on older versions -cmake_minimum_required(VERSION 2.8.12) +# Known to work with CMake 3.2.2, might work with older 3.x versions, will not +# work with versions prior to 3.0.0. + +cmake_minimum_required(VERSION 3.2.2) project(parameter-framework-plugins-skeleton) diff --git a/upstream/skeleton-subsystem/SkeletonSubsystem.cpp b/upstream/skeleton-subsystem/SkeletonSubsystem.cpp index 227d71a..9e555d7 100644 --- a/upstream/skeleton-subsystem/SkeletonSubsystem.cpp +++ b/upstream/skeleton-subsystem/SkeletonSubsystem.cpp @@ -32,11 +32,9 @@ #include "SubsystemObjectFactory.h" #include "SkeletonSubsystemObject.h" -#define base CSubsystem - // Implementation CSkeletonSubsystem::CSkeletonSubsystem(const std::string &strName, core::log::Logger &logger) - : base(strName, logger) + : CSubsystem(strName, logger) { // Provide mapping keys to upper layer addContextMappingKey("Owner"); |