Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ after_success:
--exclude "skeleton-subsystem"
--exclude "test/test-subsystem"
--exclude "bindings/c/Test.cpp"
--exclude "parameter/criterion/test/"
--exclude "test/tokenizer"
--gcov /usr/bin/gcov-4.8
--gcov-options '\--long-file-names --preserve-paths'
Expand Down
19 changes: 19 additions & 0 deletions parameter/criterion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,29 @@ include_directories(
"${PROJECT_SOURCE_DIR}/xmlserializer/"
"${PROJECT_SOURCE_DIR}/utility/")

target_link_libraries(criterion pfw_utility xmlserializer)

# '-fPIC' needed for shared library to link against libcriterion
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

# Client headers
install(FILES
include/criterion/client/CriterionInterface.h
DESTINATION "include/parameter/client/criterion")

if(BUILD_TESTING)
find_path(CATCH_HEADER catch.hpp)
include_directories(
include
${CATCH_HEADER})

# Add unit test
add_executable(criterionUnitTest test/CriterionUnitTest.cpp)

target_link_libraries(criterionUnitTest criterion)
add_test(NAME criterionUnitTest
COMMAND criterionUnitTest)

# Custom function defined in the top-level CMakeLists
set_test_env(criterionUnitTest)
endif()
Loading