diff options
| author | Sebastien Guiriec <sebastien.guiriec@renault.com> | 2016-04-26 07:26:09 +0200 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2019-03-12 17:48:47 -0700 |
| commit | 67f663e08dfcebdfaea69df36ebae6167595a549 (patch) | |
| tree | 66e6f26a6a09209dafcfb350ce0531e0fca154be /upstream/skeleton-subsystem | |
| parent | 9a458296b14bbbf4d3d4760b809c8613d46fdafb (diff) | |
| download | parameter-framework-67f663e08dfcebdfaea69df36ebae6167595a549.tar.gz | |
[PFW] Integrate PFW core version 3.2.5 release
PFW 3.2.5 release notes:
https://github.com/intel/parameter-framework/releases/tag/v3.2.5
This release contains the following changes:
- CMake Package configuration file generation
- Preliminary and unofficial OSX support in Travis-CI
- Use clang-tidy for automatic code cleanup
- Some more cleanup and fixes
- Speed Travis-CI up by using CCache
Bug: 124767636
Test: build
Change-Id: Ib7ce6824430f3907c0508194e91f71a934bdcda8
Signed-off-by: Sebastien Guiriec <sebastien.guiriec@renault.com>
Diffstat (limited to 'upstream/skeleton-subsystem')
| -rw-r--r-- | upstream/skeleton-subsystem/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | upstream/skeleton-subsystem/test/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 17 deletions
diff --git a/upstream/skeleton-subsystem/CMakeLists.txt b/upstream/skeleton-subsystem/CMakeLists.txt index 1ec822d..1bc1d87 100644 --- a/upstream/skeleton-subsystem/CMakeLists.txt +++ b/upstream/skeleton-subsystem/CMakeLists.txt @@ -31,6 +31,8 @@ cmake_minimum_required(VERSION 2.8.12) project(parameter-framework-plugins-skeleton) +find_package(ParameterFramework REQUIRED) + 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 @@ -45,29 +47,16 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN true) # Force libs and executable to all be at a known place - simplifies a lot of -# things, expecially setting the test environment +# things, especially setting the test environment set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -# -# Find PFW libraries and include directories -# -find_path(PFW_INCLUDE_ROOT NAMES parameter/plugin/Plugin.h) - -find_library(PFW_CORE_LIBRARY NAMES parameter) - -set(PFW_INCLUDE_DIRS - ${PFW_INCLUDE_ROOT}/parameter/plugin - ${PFW_INCLUDE_ROOT}/xmlserializer - ${PFW_INCLUDE_ROOT}/utility) - add_library(skeleton-subsystem MODULE SkeletonSubsystemBuilder.cpp SkeletonSubsystem.cpp SkeletonSubsystemObject.cpp) -target_include_directories(skeleton-subsystem PRIVATE ${PFW_INCLUDE_DIRS}) -target_link_libraries(skeleton-subsystem ${PFW_CORE_LIBRARY}) +target_link_libraries(skeleton-subsystem PRIVATE ParameterFramework::plugin) install(TARGETS skeleton-subsystem LIBRARY DESTINATION lib diff --git a/upstream/skeleton-subsystem/test/CMakeLists.txt b/upstream/skeleton-subsystem/test/CMakeLists.txt index 46cb669..d36d456 100644 --- a/upstream/skeleton-subsystem/test/CMakeLists.txt +++ b/upstream/skeleton-subsystem/test/CMakeLists.txt @@ -30,8 +30,7 @@ configure_file(structure.xml "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY) configure_file(toplevel.xml "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY) add_executable(skeleton-test main.cpp) -target_include_directories(skeleton-test PRIVATE "${PFW_INCLUDE_ROOT}/parameter/client") -target_link_libraries(skeleton-test "${PFW_CORE_LIBRARY}") +target_link_libraries(skeleton-test PRIVATE ParameterFramework::parameter) add_test(NAME skeleton-test WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" |