diff options
| author | Sebastien Guiriec <sebastien.guiriec@renault.com> | 2016-05-26 08:46:59 +0200 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2019-03-12 17:49:13 -0700 |
| commit | 54bdb2158f647a8c8b6af9bc2e2239a6ce7b6bbc (patch) | |
| tree | 9495e886cf828ade8d1987b75f4ad3c7eb0410a1 /upstream/skeleton-subsystem | |
| parent | 67f663e08dfcebdfaea69df36ebae6167595a549 (diff) | |
| download | parameter-framework-54bdb2158f647a8c8b6af9bc2e2239a6ce7b6bbc.tar.gz | |
[PFW] Integrate PFW core version 3.2.6 release
PFW 3.2.6 release notes:
https://github.com/intel/parameter-framework/releases/tag/v3.2.6
This release contains the following changes:
- CMake: define installation components
- Enum parameter serialization fix in raw value space
- Version number guessing now prioritizes the ".version" file generated
by the "git archive" export and then falls back to the git revision
(opposite of what was done before).
- Some CMake modernization.
Bug: 124767636
Test: build
Change-Id: Ic55dfc09da3436d0a4182463fa44a4dd6a9bfb80
Signed-off-by: Sebastien Guiriec <sebastien.guiriec@renault.com>
Diffstat (limited to 'upstream/skeleton-subsystem')
| -rw-r--r-- | upstream/skeleton-subsystem/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/upstream/skeleton-subsystem/CMakeLists.txt b/upstream/skeleton-subsystem/CMakeLists.txt index 1bc1d87..4016a41 100644 --- a/upstream/skeleton-subsystem/CMakeLists.txt +++ b/upstream/skeleton-subsystem/CMakeLists.txt @@ -33,13 +33,17 @@ project(parameter-framework-plugins-skeleton) find_package(ParameterFramework REQUIRED) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_EXTENSIONS NO) +set(CMAKE_CXX_STANDARD_REQUIRED YES) + if(WIN32) # Force include iso646.h to support alternative operator form (and, or, not...) # Such support is require by the standard and can be enabled with /Za # but doing so breaks compilation of windows headers... - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /FIiso646.h") + set_property(DIRECTORY PROPERTY COMPILE_OPTIONS /W4 /FIiso646.h) else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -Wextra -Wconversion") + set_property(DIRECTORY PROPERTY COMPILE_OPTIONS -Werror -Wall -Wextra -Wconversion) endif() # Hide symbols by default, then exposed symbols are the same in linux and windows |