diff options
| author | David Wagner <david.wagner@intel.com> | 2014-02-18 10:21:01 +0100 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-18 10:21:01 +0100 |
| commit | 0050049e450ee3a815710c84d724b1575e496800 (patch) | |
| tree | a38328b496ae68e4a5a732694fff10a8194cbf0b | |
| parent | f50298799d1d73c0c40940ca5e8cb71a6b28f798 (diff) | |
| download | external_parameter-framework-0050049e450ee3a815710c84d724b1575e496800.zip external_parameter-framework-0050049e450ee3a815710c84d724b1575e496800.tar.gz external_parameter-framework-0050049e450ee3a815710c84d724b1575e496800.tar.bz2 | |
CMake: beautification, fix some comments
Signed-off-by: David Wagner <david.wagner@intel.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | parameter/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | remote-process/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/test-platform/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | utility/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xmlserializer/CMakeLists.txt | 2 |
6 files changed, 16 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 283f452..b12c5f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ endif(COMMAND cmake_policy) project(parameter-framework) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra") # -Wno-unused-parameter +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra") add_subdirectory(xmlserializer) add_subdirectory(parameter) diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt index 0d962ee..1bbebfb 100644 --- a/parameter/CMakeLists.txt +++ b/parameter/CMakeLists.txt @@ -168,10 +168,11 @@ add_library(parameter SHARED RuleParser.cpp EnumValuePair.cpp) -include_directories("include") -include_directories("${PROJECT_SOURCE_DIR}/xmlserializer") -include_directories("${PROJECT_SOURCE_DIR}/utility") -include_directories("${PROJECT_SOURCE_DIR}/remote-processor") +include_directories( + include + "${PROJECT_SOURCE_DIR}/xmlserializer" + "${PROJECT_SOURCE_DIR}/utility" + "${PROJECT_SOURCE_DIR}/remote-processor") # No need to link with libremote-processor: it is accessed via dlopen() target_link_libraries(parameter xmlserializer pfw_utility) diff --git a/remote-process/CMakeLists.txt b/remote-process/CMakeLists.txt index 80fd177..0cf477a 100644 --- a/remote-process/CMakeLists.txt +++ b/remote-process/CMakeLists.txt @@ -2,8 +2,9 @@ add_executable(remote-process main.cpp) # TODO: WIN32 ? # TODO: separate remote-processor's includes in half (public/private) # And use only public headers here -include_directories("${PROJECT_SOURCE_DIR}/remote-processor") -include_directories("${PROJECT_SOURCE_DIR}/utility") +include_directories( + "${PROJECT_SOURCE_DIR}/remote-processor" + "${PROJECT_SOURCE_DIR}/utility") target_link_libraries(remote-process remote-processor pfw_utility) diff --git a/test/test-platform/CMakeLists.txt b/test/test-platform/CMakeLists.txt index afc7dc5..c379171 100644 --- a/test/test-platform/CMakeLists.txt +++ b/test/test-platform/CMakeLists.txt @@ -2,12 +2,13 @@ add_executable(test-platform # WIN32 ? main.cpp TestPlatform.cpp) -# FIXME +# FIXME: Supress the need for the -Wno-unused-parameter set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") -include_directories("${PROJECT_SOURCE_DIR}/parameter/include") -include_directories("${PROJECT_SOURCE_DIR}/remote-processor") -include_directories("${PROJECT_SOURCE_DIR}/utility") +include_directories( + "${PROJECT_SOURCE_DIR}/parameter/include" + "${PROJECT_SOURCE_DIR}/remote-processor" + "${PROJECT_SOURCE_DIR}/utility") target_link_libraries(test-platform parameter remote-processor) diff --git a/utility/CMakeLists.txt b/utility/CMakeLists.txt index ac4d5b7..698c781 100644 --- a/utility/CMakeLists.txt +++ b/utility/CMakeLists.txt @@ -3,5 +3,5 @@ add_library(pfw_utility STATIC Utility.cpp NaiveTokenizer.cpp) -# Needed for linking libpfw_utility against shared libraries e.g. libparameter) +# '-fPIC' needed for linking against shared libraries (e.g. libparameter) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") diff --git a/xmlserializer/CMakeLists.txt b/xmlserializer/CMakeLists.txt index c4358b1..77b4fb3 100644 --- a/xmlserializer/CMakeLists.txt +++ b/xmlserializer/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(xmlserializer SHARED XmlStringDocSource.cpp) include(FindLibXml2) -# TODO: check for the "XInclude" feature in libxml2 +# TODO: check for the "XInclude" feature in libxml2 (how to ?) include_directories(${LIBXML2_INCLUDE_DIR}) target_link_libraries(xmlserializer ${LIBXML2_LIBRARIES}) |