diff options
24 files changed, 130 insertions, 68 deletions
diff --git a/support/android/parameter/version.h b/support/android/parameter/version.h index e7707cc..6aa1662 100644 --- a/support/android/parameter/version.h +++ b/support/android/parameter/version.h @@ -27,4 +27,4 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define PARAMETER_FRAMEWORK_VERSION "v3.2.5" +#define PARAMETER_FRAMEWORK_VERSION "v3.2.6" diff --git a/upstream/.gitattributes b/upstream/.gitattributes deleted file mode 100644 index b977122..0000000 --- a/upstream/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -.version export-subst -.gitattributes export-ignore -.gitignore export-ignore diff --git a/upstream/.gitignore b/upstream/.gitignore deleted file mode 100644 index b3e751b..0000000 --- a/upstream/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.pyc -*.pyo -*.win -*.layout -*.user -*.user.* diff --git a/upstream/.travis.yml b/upstream/.travis.yml index 5d4060b..343e1ee 100644 --- a/upstream/.travis.yml +++ b/upstream/.travis.yml @@ -40,7 +40,7 @@ addons: sources: - ubuntu-toolchain-r-test - george-edison55-precise-backports - - llvm-toolchain-precise + - llvm-toolchain-precise-3.8 # Travis white list of dpkg packages # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise packages: @@ -118,6 +118,10 @@ script: cmake $MY_CMAKE_OPTIONS . && make && make install ); fi + # Check that all installed files are in a component (no "unspecified + # component" archive created) + - (cd build && cpack -G TGZ -D CPACK_ARCHIVE_COMPONENT_INSTALL=ON && + [ ! -a '*-Unspecified.tar.gz' ]) # Keep this last - ( mkdir build_less_features && cd build_less_features && rm -rf $PREFIX/asio-1.10.6 && diff --git a/upstream/.version b/upstream/.version index 793dd64..c4441fa 100644 --- a/upstream/.version +++ b/upstream/.version @@ -1 +1 @@ -tag: v3.2.5 +HEAD -> master, tag: v3.2.6 diff --git a/upstream/CMakeLists.txt b/upstream/CMakeLists.txt index 8174218..463f45f 100644 --- a/upstream/CMakeLists.txt +++ b/upstream/CMakeLists.txt @@ -57,6 +57,10 @@ include(SetVersion.cmake) # call the wrapper list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}/cmake") +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_EXTENSIONS NO) +set(CMAKE_CXX_STANDARD_REQUIRED YES) + if(WIN32) # By default cmake adds a warning level. # Nevertheless a different level is wanted for this project. @@ -76,15 +80,13 @@ if(WIN32) # and thus are not to be used by the client. A better fix would be to export # only public methods instead of the whole class, but they are too many to # do that. A separated plugin interface would fix that. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /FIiso646.h -wd4127 -wd4251") + add_compile_options(/W4 /FIiso646.h -wd4127 -wd4251) # FIXME: Once we have removed all warnings on windows, add the /WX flags if # FATAL_WARNINGS is enabled else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wconversion -Wno-sign-conversion") - if(FATAL_WARNINGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") - endif() + add_compile_options(-Wall -Wextra -Wconversion -Wno-sign-conversion + $<$<BOOL:FATAL_WARNINGS>:-Werror>) endif() # Hide symbols by default, then exposed symbols are the same in linux and windows @@ -101,6 +103,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) include(ctest/CMakeLists.txt) +# Since there is no directory-wide property for linker flags, we can't use +# set_property for the link-time coverage flags. if(COVERAGE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage") diff --git a/upstream/SetVersion.cmake b/upstream/SetVersion.cmake index 3adeec1..eb95f9d 100644 --- a/upstream/SetVersion.cmake +++ b/upstream/SetVersion.cmake @@ -37,24 +37,25 @@ set(PF_VERSION_DIRTY "") # Find and set the Parameter Framework's version # First, let's see if the user forced a version (i.e. "vX.Y.Z-N") if(NOT DEFINED PF_VERSION) - # Else, try to get it from git - execute_process(COMMAND git describe --tags --long --dirty --abbrev=12 - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - OUTPUT_VARIABLE PF_VERSION - RESULT_VARIABLE GIT_DESCRIBE_RESULT - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET) - if(GIT_DESCRIBE_RESULT GREATER 0) - # Or fall back to reading it from .version (this will happen when - # building from an archive) - file(READ "${PROJECT_SOURCE_DIR}/.version" PF_VERSION_FILE_CONTENT) + # Else, try to get it from .version (this will happen when + # building from an archive) + file(READ "${PROJECT_SOURCE_DIR}/.version" PF_VERSION_FILE_CONTENT) - set(REGEX "tag: (v[0-9.]+)") - if(PF_VERSION_FILE_CONTENT MATCHES ${REGEX}) - set(PF_VERSION "${CMAKE_MATCH_1}-0") - endif() + set(REGEX "tag: (v[0-9.]+)") + if(PF_VERSION_FILE_CONTENT MATCHES ${REGEX}) + set(PF_VERSION "${CMAKE_MATCH_1}-0") + + else() + # Or fall back from git + execute_process(COMMAND git describe --tags --long --dirty --abbrev=12 + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + OUTPUT_VARIABLE PF_VERSION + RESULT_VARIABLE GIT_DESCRIBE_RESULT + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET) endif() + else() # Set the "nice version string" to the one forced by the user set(NICE_PF_VERSION "${PF_VERSION}") @@ -73,6 +74,11 @@ endif() # If we are precisely on a tag, make a nicer version string (unless otherwise # forced by the user - see above) -if((NOT DEFINED NICE_PF_VERSION) AND (PF_VERSION_TWEAK EQUAL 0) AND (NOT PF_VERSION_DIRTY)) - set(NICE_PF_VERSION "v${PF_VERSION_MAJOR}.${PF_VERSION_MINOR}.${PF_VERSION_PATCH}") +if((NOT DEFINED NICE_PF_VERSION)) + if((PF_VERSION_TWEAK EQUAL 0) AND (NOT PF_VERSION_DIRTY)) + set(NICE_PF_VERSION "v${PF_VERSION_MAJOR}.${PF_VERSION_MINOR}.${PF_VERSION_PATCH}") + else() + # Fallback + set(NICE_PF_VERSION "${PF_VERSION}") + endif() endif() diff --git a/upstream/bindings/c/CMakeLists.txt b/upstream/bindings/c/CMakeLists.txt index c04ac3c..f9dd3d0 100644 --- a/upstream/bindings/c/CMakeLists.txt +++ b/upstream/bindings/c/CMakeLists.txt @@ -33,11 +33,15 @@ generate_export_header(cparameter) install(FILES ParameterFramework.h "${CMAKE_CURRENT_BINARY_DIR}/cparameter_export.h" - DESTINATION "include/parameter/c") + DESTINATION "include/parameter/c" + COMPONENT c_dev) target_link_libraries(cparameter PRIVATE parameter pfw_utility) -install(TARGETS cparameter LIBRARY DESTINATION lib RUNTIME DESTINATION bin) +install(TARGETS cparameter + LIBRARY DESTINATION lib COMPONENT c + RUNTIME DESTINATION bin COMPONENT c + ARCHIVE DESTINATION lib COMPONENT c_dev) if(BUILD_TESTING) # Add unit test diff --git a/upstream/bindings/python/CMakeLists.txt b/upstream/bindings/python/CMakeLists.txt index 5807633..23e08c1 100644 --- a/upstream/bindings/python/CMakeLists.txt +++ b/upstream/bindings/python/CMakeLists.txt @@ -76,7 +76,7 @@ set_property(TARGET _PyPfw PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BIN # generated by swig generates warnings. We don't apply the FATAL_WARNING policy # here, since we consider this generated code as external. target_compile_definitions(_PyPfw PRIVATE SWIG_PYTHON_SILENT_MEMLEAK) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error") +target_compile_options(_PyPfw PRIVATE -Wno-error) # Find the python modules install path. @@ -89,7 +89,8 @@ execute_process(COMMAND print(sysconfig.get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_MODULE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) -install(TARGETS _PyPfw LIBRARY DESTINATION ${PYTHON_MODULE_PATH}) +install(TARGETS _PyPfw LIBRARY DESTINATION ${PYTHON_MODULE_PATH} COMPONENT python) # install the generated Python file as well -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PyPfw.py DESTINATION ${PYTHON_MODULE_PATH}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PyPfw.py DESTINATION ${PYTHON_MODULE_PATH} + COMPONENT python) diff --git a/upstream/cmake/CMakeLists.txt b/upstream/cmake/CMakeLists.txt index 29ce10a..319616b 100644 --- a/upstream/cmake/CMakeLists.txt +++ b/upstream/cmake/CMakeLists.txt @@ -43,8 +43,10 @@ export(EXPORT ParameterTargets install(EXPORT ParameterTargets DESTINATION lib/cmake/ParameterFramework FILE ParameterFrameworkTargets.cmake - NAMESPACE ParameterFramework::) + NAMESPACE ParameterFramework:: + COMPONENT dev) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParameterFrameworkConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/ParameterFrameworkConfigVersion.cmake" - DESTINATION lib/cmake/ParameterFramework) + DESTINATION lib/cmake/ParameterFramework + COMPONENT dev) diff --git a/upstream/cpack/CMakeLists.txt b/upstream/cpack/CMakeLists.txt index 516ce4d..25d9298 100644 --- a/upstream/cpack/CMakeLists.txt +++ b/upstream/cpack/CMakeLists.txt @@ -47,6 +47,8 @@ set(CPACK_WIX_UPGRADE_GUID "47E60D10-B344-445D-A2F6-5684CC8B1D47") if (WIN32) # On windows, pack compiler provided libraries (MSVC redistributable) with the project + # Have cpack make a specific archive for them + set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT runtime_deps) include(InstallRequiredSystemLibraries) # TODO: pack libxml2.dll with the project endif() diff --git a/upstream/parameter/CMakeLists.txt b/upstream/parameter/CMakeLists.txt index 05c90af..ca956f5 100644 --- a/upstream/parameter/CMakeLists.txt +++ b/upstream/parameter/CMakeLists.txt @@ -132,19 +132,24 @@ target_link_libraries(parameter target_include_directories(parameter PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/log/include>) + PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/log/include> + INTERFACE $<INSTALL_INTERFACE:include/parameter/client> + INTERFACE $<INSTALL_INTERFACE:include/parameter/plugin>) install(TARGETS parameter EXPORT ParameterTargets - LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib - INCLUDES DESTINATION "include/parameter/client" "include/parameter/plugin") + LIBRARY DESTINATION lib COMPONENT runtime + RUNTIME DESTINATION bin COMPONENT runtime + ARCHIVE DESTINATION lib COMPONENT dev) # Export an interface library for plugins to use (after the ParameterFramework # project is built and installed). It makes them link against libparameter and # use xmlserializer's and pfw_utilify's include directories. add_library(plugin INTERFACE) target_link_libraries(plugin INTERFACE parameter) -install(TARGETS plugin EXPORT ParameterTargets - INCLUDES DESTINATION "include/parameter/xmlserializer" "include/parameter/utility") +target_include_directories(plugin + INTERFACE $<INSTALL_INTERFACE:include/parameter/xmlserializer> + INTERFACE $<INSTALL_INTERFACE:include/parameter/utility>) +install(TARGETS plugin EXPORT ParameterTargets COMPONENT dev) # Unfortunately, while the "plugin" interface library is suitable for external # plugins (built using the installed Parameter Framework) we want to build some # plugins before the whole project is installed. Therefore, they need to get @@ -164,7 +169,8 @@ install(FILES include/ParameterMgrPlatformConnector.h include/SelectionCriterionInterface.h include/SelectionCriterionTypeInterface.h - DESTINATION "include/parameter/client") + DESTINATION "include/parameter/client" + COMPONENT dev) # Core (plugin) headers install(FILES "${CMAKE_CURRENT_BINARY_DIR}/parameter_export.h" @@ -191,6 +197,8 @@ install(FILES Syncer.h TypeElement.h VirtualSubsystem.h - DESTINATION "include/parameter/plugin") + DESTINATION "include/parameter/plugin" + COMPONENT dev) install(DIRECTORY log/include/log/ - DESTINATION "include/parameter/plugin/log") + DESTINATION "include/parameter/plugin/log" + COMPONENT dev) diff --git a/upstream/parameter/EnumParameterType.cpp b/upstream/parameter/EnumParameterType.cpp index 6eea694..468b6c6 100644 --- a/upstream/parameter/EnumParameterType.cpp +++ b/upstream/parameter/EnumParameterType.cpp @@ -32,6 +32,8 @@ #include "ParameterAccessContext.h" #include "convert.hpp" +#include <iomanip> + #define base CParameterType using std::string; @@ -129,20 +131,46 @@ int32_t CEnumParameterType::getMax() const } bool CEnumParameterType::fromBlackboard(string &userValue, const uint32_t &value, - CParameterAccessContext & /*ctx*/) const + CParameterAccessContext &ctx) const { // Convert the raw value from the blackboard int32_t signedValue = static_cast<int32_t>(value); signExtend(signedValue); - // Convert from numerical space to literal space - return getLiteral(signedValue, userValue); + // Take care of format + if (ctx.valueSpaceIsRaw()) { + + // Format + std::ostringstream sstream; + + // Numerical format requested + if (ctx.outputRawFormatIsHex()) { + + // Hexa display with unecessary bits cleared out + sstream << "0x" << std::hex << std::uppercase + << std::setw(static_cast<int>(getSize() * 2)) << std::setfill('0') + << makeEncodable(value); + + userValue = sstream.str(); + } else { + userValue = std::to_string(value); + } + } else { + // Literal display requested (should succeed) + getLiteral(signedValue, userValue); + } + return true; } // Value access bool CEnumParameterType::toBlackboard(int32_t userValue, uint32_t &value, CParameterAccessContext ¶meterAccessContext) const { + // Take care of format + if (parameterAccessContext.valueSpaceIsRaw()) { + signExtend(userValue); + } + if (!checkValueAgainstSpace(userValue)) { parameterAccessContext.setError(std::to_string(userValue) + diff --git a/upstream/remote-process/CMakeLists.txt b/upstream/remote-process/CMakeLists.txt index e27a101..f9c9bc3 100644 --- a/upstream/remote-process/CMakeLists.txt +++ b/upstream/remote-process/CMakeLists.txt @@ -33,7 +33,8 @@ if(NETWORKING) find_package(Threads REQUIRED) target_link_libraries(remote-process - PRIVATE remote-processor pfw_utility asio ${CMAKE_THREAD_LIBS_INIT}) + PRIVATE remote-processor pfw_utility asio Threads::Threads) - install(TARGETS remote-process RUNTIME DESTINATION bin) + install(TARGETS remote-process RUNTIME DESTINATION bin + COMPONENT eng) endif() diff --git a/upstream/remote-processor/CMakeLists.txt b/upstream/remote-processor/CMakeLists.txt index 5887bf5..80f272a 100644 --- a/upstream/remote-processor/CMakeLists.txt +++ b/upstream/remote-processor/CMakeLists.txt @@ -40,7 +40,9 @@ generate_export_header(remote-processor set(CMAKE_THREAD_PREFER_PTHREAD 1) find_package(Threads REQUIRED) -target_link_libraries(remote-processor PRIVATE pfw_utility asio ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(remote-processor PRIVATE pfw_utility asio Threads::Threads) install(TARGETS remote-processor EXPORT ParameterTargets - LIBRARY DESTINATION lib RUNTIME DESTINATION bin) + LIBRARY DESTINATION lib COMPONENT runtime + RUNTIME DESTINATION bin COMPONENT runtime + ARCHIVE DESTINATION lib COMPONENT dev) diff --git a/upstream/schemas/CMakeLists.txt b/upstream/schemas/CMakeLists.txt index ba876fe..0b9dc6c 100644 --- a/upstream/schemas/CMakeLists.txt +++ b/upstream/schemas/CMakeLists.txt @@ -37,4 +37,5 @@ install(FILES ComponentLibrary.xsd Subsystem.xsd SystemClass.xsd W3cXmlAttributes.xsd - DESTINATION share/${PROJECT_NAME}/schemas) + DESTINATION share/${PROJECT_NAME}/schemas + COMPONENT eng) 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 diff --git a/upstream/test/functional-tests/Handle.cpp b/upstream/test/functional-tests/Handle.cpp index d7aafb9..fd25da8 100644 --- a/upstream/test/functional-tests/Handle.cpp +++ b/upstream/test/functional-tests/Handle.cpp @@ -384,8 +384,8 @@ static const char *testRawHexBasicSettingsXML = R"( <IntegerParameter Name="integer_array">0xFFFFFFF6 0x00000000 0x00000008 0x0000000A</IntegerParameter> <FixedPointParameter ValueSpace="Raw" Name="fix_point">0x24000000</FixedPointParameter> <FixedPointParameter ValueSpace="Raw" Name="fix_point_array">0x72000000 0x0B000000 0xF0000000</FixedPointParameter> - <EnumParameter Name="enum">five</EnumParameter> - <EnumParameter Name="enum_array">eight min eight min</EnumParameter> + <EnumParameter Name="enum">0x05</EnumParameter> + <EnumParameter Name="enum_array">0x0008 0x8001 0x0008 0x8001</EnumParameter> <StringParameter Name="string">A string of 32 character.@@@@@@@</StringParameter> <BitParameterBlock Name="bit_block"> <BitParameter Name="one">0x1</BitParameter> diff --git a/upstream/test/test-platform/CMakeLists.txt b/upstream/test/test-platform/CMakeLists.txt index 533de3c..5c54b4a 100644 --- a/upstream/test/test-platform/CMakeLists.txt +++ b/upstream/test/test-platform/CMakeLists.txt @@ -36,5 +36,5 @@ if(NETWORKING) # Workaround because asio is still leaking to test-platform target_link_libraries(test-platform PRIVATE asio) - install(TARGETS test-platform RUNTIME DESTINATION bin) + install(TARGETS test-platform RUNTIME DESTINATION bin COMPONENT eng) endif() diff --git a/upstream/tools/bash_completion/CMakeLists.txt b/upstream/tools/bash_completion/CMakeLists.txt index f2fb491..435ee69 100644 --- a/upstream/tools/bash_completion/CMakeLists.txt +++ b/upstream/tools/bash_completion/CMakeLists.txt @@ -27,4 +27,5 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. install(FILES remote-process - DESTINATION share/bash-completion/completions/) + DESTINATION share/bash-completion/completions/ + COMPONENT eng) diff --git a/upstream/tools/xmlGenerator/CMakeLists.txt b/upstream/tools/xmlGenerator/CMakeLists.txt index 72d1d95..a3567c5 100644 --- a/upstream/tools/xmlGenerator/CMakeLists.txt +++ b/upstream/tools/xmlGenerator/CMakeLists.txt @@ -29,7 +29,7 @@ add_executable(domainGeneratorConnector domainGeneratorConnector.cpp) target_link_libraries(domainGeneratorConnector PRIVATE parameter pfw_utility) -install(TARGETS domainGeneratorConnector RUNTIME DESTINATION bin) +install(TARGETS domainGeneratorConnector RUNTIME DESTINATION bin COMPONENT eng) install(PROGRAMS domainGenerator.sh @@ -40,4 +40,5 @@ install(PROGRAMS EddParser.py PFWScriptGenerator.py updateRoutageDomains.sh - DESTINATION bin) + DESTINATION bin + COMPONENT eng) diff --git a/upstream/tools/xmlValidator/CMakeLists.txt b/upstream/tools/xmlValidator/CMakeLists.txt index f44fed0..536f948 100644 --- a/upstream/tools/xmlValidator/CMakeLists.txt +++ b/upstream/tools/xmlValidator/CMakeLists.txt @@ -26,4 +26,4 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -install(PROGRAMS xmlValidator.py DESTINATION bin) +install(PROGRAMS xmlValidator.py DESTINATION bin COMPONENT eng) diff --git a/upstream/utility/CMakeLists.txt b/upstream/utility/CMakeLists.txt index 8173eca..0350275 100644 --- a/upstream/utility/CMakeLists.txt +++ b/upstream/utility/CMakeLists.txt @@ -46,7 +46,8 @@ install(FILES ErrorContext.hpp Utility.h convert.hpp - DESTINATION "include/parameter/utility") + DESTINATION "include/parameter/utility" + COMPONENT dev) if(BUILD_TESTING) # Add unit test diff --git a/upstream/xmlserializer/CMakeLists.txt b/upstream/xmlserializer/CMakeLists.txt index 91f51d2..ee263a5 100644 --- a/upstream/xmlserializer/CMakeLists.txt +++ b/upstream/xmlserializer/CMakeLists.txt @@ -69,4 +69,5 @@ install(FILES XmlSource.h XmlElement.h XmlSerializingContext.h - DESTINATION "include/parameter/xmlserializer") + DESTINATION "include/parameter/xmlserializer" + COMPONENT dev) |