From 51307b7cdc0cc45442bf88d5cd772752910bbb09 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 26 Jan 2017 13:54:19 -0200 Subject: [PATCH] cmake: fix test include and defines. TESTS_WD is prefixed to TESTS_SRC_DIR and should be empty (no idea why it's like that, maybe to allow relative paths). TESTS_SRC_DIR must be defined to test source directory and a typo was preventing that. --- cmake/helpers/EflMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake index b2630a8a07..fa647508b5 100644 --- a/cmake/helpers/EflMacros.cmake +++ b/cmake/helpers/EflMacros.cmake @@ -1169,7 +1169,7 @@ function(EFL_TEST _testname) endif() target_include_directories(${_testtarget} PRIVATE - ${_testrcdir} + ${_testsrcdir} ${_testbindir} ${INCLUDE_DIRECTORIES}) target_include_directories(${_testtarget} SYSTEM PRIVATE @@ -1182,9 +1182,9 @@ function(EFL_TEST _testname) target_compile_definitions(${_testtarget} PRIVATE "-DPACKAGE_DATA_DIR=\"${EFL_TESTS_SOURCE_DIR}\"" - "-DTESTS_SRC_DIR=\"${_testrcdir}\"" + "-DTESTS_SRC_DIR=\"${_testsrcdir}\"" "-DTESTS_BUILD_DIR=\"${_testbindir}\"" - "-DTESTS_WD=\"${PROJECT_BINARY_DIR}\"" + "-DTESTS_WD=\"\"" ${DEFINITIONS} )