From f4744e1d2a6cb1698400dd9922edaf7ac56d100d Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 26 Jan 2017 13:56:49 -0200 Subject: [PATCH] cmake: auto-detect tests in src/tests/libname if no CMakeLists.txt previously we were only auto-detecting sources in src/tests/libname/ subdirectories, but we should also check the parent directory if no subdirectories were processed. --- cmake/helpers/EflMacros.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake index fa647508b5..098d229165 100644 --- a/cmake/helpers/EflMacros.cmake +++ b/cmake/helpers/EflMacros.cmake @@ -733,6 +733,10 @@ function(_EFL_LIB_PROCESS_TESTS_INTERNAL) endforeach() endif() + if(NOT ${EFL_LIB_CURRENT}_TESTS AND EXISTS ${EFL_TESTS_SOURCE_DIR} AND NOT EXISTS ${EFL_TESTS_SOURCE_DIR}/CMakeLists.txt) + EFL_TEST(${EFL_LIB_CURRENT}) + endif() + if(${EFL_LIB_CURRENT}_TESTS) add_custom_target(${EFL_LIB_CURRENT}-tests DEPENDS ${${EFL_LIB_CURRENT}_TESTS}) LIST_APPEND_GLOBAL(EFL_ALL_TESTS ${EFL_LIB_CURRENT}-tests)