From fbe30f0aacf14c00664ae48833422705eb4c33cc Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 21 Aug 2018 12:18:48 +0200 Subject: [PATCH] cmake: rename unit-test target to avoid name collision with parent projects --- common/.gitlab-ci.yml | 2 +- common/tests/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/.gitlab-ci.yml b/common/.gitlab-ci.yml index cbc2a3b61..a9f9cada1 100644 --- a/common/.gitlab-ci.yml +++ b/common/.gitlab-ci.yml @@ -50,7 +50,7 @@ test:unit: dependencies: - build:source script: - - build/tests/unit-tests + - build/tests/unit-tests-common image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} tags: - docker diff --git a/common/tests/CMakeLists.txt b/common/tests/CMakeLists.txt index f76ec8ec8..445523159 100644 --- a/common/tests/CMakeLists.txt +++ b/common/tests/CMakeLists.txt @@ -26,16 +26,16 @@ set(SOURCES graph.cpp ) -add_executable(unit-tests ${SOURCES}) +add_executable(unit-tests-common ${SOURCES}) find_package(Criterion REQUIRED) -target_include_directories(unit-tests PUBLIC +target_include_directories(unit-tests-common PUBLIC ${PROJECT_SOURCE_DIR}/include ${CRITERION_INCLUDE_DIRECTORIES} ) -target_link_libraries(unit-tests PUBLIC +target_link_libraries(unit-tests-common PUBLIC villas-common ${CRITERION_LIBRARIES} )