diff options
| -rw-r--r-- | parameter/CMakeLists.txt | 85 | ||||
| -rw-r--r-- | remote-process/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | remote-processor/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | test/test-platform/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xmlserializer/CMakeLists.txt | 18 |
5 files changed, 34 insertions, 81 deletions
diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt index 1dc1d32..5bef4ec 100644 --- a/parameter/CMakeLists.txt +++ b/parameter/CMakeLists.txt @@ -178,103 +178,36 @@ include_directories( target_link_libraries(parameter xmlserializer pfw_utility) install(TARGETS parameter LIBRARY DESTINATION lib) -# TODO: Check if all of these files are truly needed -# TODO: export client headers and core (plugin) headers separately +# Client headers +install(FILES + include/ParameterHandle.h + include/ParameterMgrPlatformConnector.h + include/SelectionCriterionInterface.h + include/SelectionCriterionTypeInterface.h + DESTINATION "include/parameter/client") +# Core (plugin) headers install(FILES - ## Client headers - # include/ParameterHandle.h - # include/ParameterMgrPlatformConnector.h - # include/SelectionCriterionInterface.h - # include/SelectionCriterionTypeInterface.h - ## Core (plugin) headers - AreaConfiguration.h - ArrayParameter.h - AutoLock.h AutoLog.h - BackSynchronizer.h - BaseParameter.h - BinarySerializableElement.h - BinaryStream.h - BitParameter.h - BitParameterBlock.h BitParameterBlockType.h - BitParameterType.h - BitwiseAreaConfiguration.h - BooleanParameterType.h - Component.h - ComponentInstance.h - ComponentLibrary.h - ComponentType.h - CompoundRule.h - ConfigurableDomain.h - ConfigurableDomains.h ConfigurableElement.h - ConfigurableElementAggregator.h - ConfigurationAccessContext.h DefaultElementLibrary.h - DomainConfiguration.h Element.h ElementBuilder.h - ElementBuilderTemplate.h ElementLibrary.h - ElementLibrarySet.h - ElementLocator.h - EnumParameterType.h - EnumValuePair.h - ErrorContext.h - FixedPointParameterType.h FormattedSubsystemObject.h - FrameworkConfigurationGroup.h - FrameworkConfigurationLocation.h - HardwareBackSynchronizer.h InstanceConfigurableElement.h - InstanceDefinition.h - IntegerParameterType.h - KindElement.h - KindElementBuilderTemplate.h - LinearParameterAdaptation.h Mapper.h MappingContext.h - MappingData.h NamedElementBuilderTemplate.h - Parameter.h - ParameterAccessContext.h - ParameterAdaptation.h - ParameterBlackboard.h - ParameterBlock.h ParameterBlockType.h - ParameterFrameworkConfiguration.h - ParameterMgr.h - ParameterMgrLogger.h ParameterType.h PathNavigator.h - PluginLocation.h - Rule.h - RuleParser.h - SelectionCriteria.h - SelectionCriteriaDefinition.h - SelectionCriterion.h - SelectionCriterionLibrary.h - SelectionCriterionRule.h - SelectionCriterionType.h - SimulatedBackSynchronizer.h - StringParameter.h - StringParameterType.h Subsystem.h - SubsystemElementBuilder.h SubsystemLibrary.h SubsystemObject.h SubsystemObjectCreator.h SubsystemObjectFactory.h - SubsystemPlugins.h Syncer.h - SyncerSet.h - SystemClass.h TypeElement.h VirtualSubsystem.h - VirtualSyncer.h - XmlDomainSerializingContext.h - XmlElementSerializingContext.h - XmlFileIncluderElement.h - XmlParameterSerializingContext.h - DESTINATION "include/parameter") + DESTINATION "include/parameter/plugin") diff --git a/remote-process/CMakeLists.txt b/remote-process/CMakeLists.txt index 0cf477a..d5bda0a 100644 --- a/remote-process/CMakeLists.txt +++ b/remote-process/CMakeLists.txt @@ -1,4 +1,4 @@ -add_executable(remote-process main.cpp) # TODO: WIN32 ? +add_executable(remote-process main.cpp) # TODO: separate remote-processor's includes in half (public/private) # And use only public headers here diff --git a/remote-processor/CMakeLists.txt b/remote-processor/CMakeLists.txt index 60b6ff2..7b2cf0c 100644 --- a/remote-processor/CMakeLists.txt +++ b/remote-processor/CMakeLists.txt @@ -8,9 +8,13 @@ add_library(remote-processor SHARED RemoteProcessorServer.cpp RemoteProcessorServerBuilder.cpp) +set(CMAKE_THREAD_PREFER_PTHREAD 1) include(FindThreads) -# TODO: use the "prefer pthread" option; check if we are using pthread (what to -# do else ?) +if(NOT CMAKE_USE_PTHREADS_INIT) + message(SEND_ERROR " + pthread library not found! Please install the POSIX thread library and + headers.") +endif(NOT CMAKE_USE_PTHREADS_INIT) target_link_libraries(remote-processor ${CMAKE_THREAD_LIBS_INIT}) install(TARGETS remote-processor LIBRARY DESTINATION lib) diff --git a/test/test-platform/CMakeLists.txt b/test/test-platform/CMakeLists.txt index c379171..f173c7b 100644 --- a/test/test-platform/CMakeLists.txt +++ b/test/test-platform/CMakeLists.txt @@ -1,4 +1,4 @@ -add_executable(test-platform # WIN32 ? +add_executable(test-platform main.cpp TestPlatform.cpp) diff --git a/xmlserializer/CMakeLists.txt b/xmlserializer/CMakeLists.txt index 409719a..6ba2768 100644 --- a/xmlserializer/CMakeLists.txt +++ b/xmlserializer/CMakeLists.txt @@ -11,9 +11,25 @@ add_library(xmlserializer SHARED XmlStringDocSource.cpp) include(FindLibXml2) -# TODO: check for the "XInclude" feature in libxml2 (how to ?) +if(NOT LIBXML2_FOUND) + message(SEND_ERROR " + libxml2 NOT found. The parameter-framework wont compile. + Please install the development package (e.g. libxml2-dev on debian-based + Linux distributions).") +else(NOT LIBXML2_FOUND) + # libxml2 has been found, but does it support XInclude ? + include(CheckLibraryExists) + check_library_exists(xml2 xmlXIncludeProcess "" XML2_XINCLUDE_SUPPORT) + if(NOT XML2_XINCLUDE_SUPPORT) + message(SEND_ERROR " + libxml2 has not been built with support for XInclude. xmlserializer needs + that feature; please install a version of libxml2 supporting it.") + endif(NOT XML2_XINCLUDE_SUPPORT) +endif(NOT LIBXML2_FOUND) + include_directories(${LIBXML2_INCLUDE_DIR}) target_link_libraries(xmlserializer ${LIBXML2_LIBRARIES}) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBXML2_DEFINITIONS}") install(TARGETS xmlserializer LIBRARY DESTINATION lib) install(FILES |