From 3d7a3a51a7f384e39ec50c2ed56d39de37cd7d5d Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 1 Apr 2019 17:30:10 +0300 Subject: [PATCH 1/2] cmake: don't add tests dirs as include directories - use relative paths for includes - fix PCH generation with GCC (dummy file has been used) --- cmake/OpenCVModule.cmake | 4 ++-- cmake/OpenCVPCHSupport.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 5f41ce42a0..3aef09af22 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -1148,7 +1148,7 @@ function(ocv_add_perf_tests) source_group("Src" FILES "${${the_target}_pch}") ocv_add_executable(${the_target} ${OPENCV_PERF_${the_module}_SOURCES} ${${the_target}_pch}) - ocv_target_include_modules(${the_target} ${perf_deps} "${perf_path}") + ocv_target_include_modules(${the_target} ${perf_deps}) ocv_target_link_libraries(${the_target} LINK_PRIVATE ${perf_deps} ${OPENCV_MODULE_${the_module}_DEPS} ${OPENCV_LINKER_LIBS} ${OPENCV_PERF_${the_module}_DEPS}) add_dependencies(opencv_perf_tests ${the_target}) @@ -1239,7 +1239,7 @@ function(ocv_add_accuracy_tests) source_group("Src" FILES "${${the_target}_pch}") ocv_add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES} ${${the_target}_pch}) - ocv_target_include_modules(${the_target} ${test_deps} "${test_path}") + ocv_target_include_modules(${the_target} ${test_deps}) if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/test") ocv_target_include_directories(${the_target} "${CMAKE_CURRENT_BINARY_DIR}/test") endif() diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake index f9b1b48b65..59bc826ed0 100644 --- a/cmake/OpenCVPCHSupport.cmake +++ b/cmake/OpenCVPCHSupport.cmake @@ -261,6 +261,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) ) _PCH_GET_COMPILE_FLAGS(_compile_FLAGS) + list(APPEND _compile_FLAGS "${_PCH_include_prefix}\"${_path}\"") get_target_property(type ${_targetName} TYPE) if(type STREQUAL "SHARED_LIBRARY") From cd6d8048bb129c1975faa3e21ca2990f1ffaefab Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 1 Apr 2019 17:31:03 +0300 Subject: [PATCH 2/2] gapi: fix tests build --- modules/gapi/perf/common/gapi_core_perf_tests.cpp | 2 +- modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp | 2 +- modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp | 2 +- modules/gapi/test/common/gapi_compoundkernel_tests.cpp | 2 +- modules/gapi/test/common/gapi_core_tests.cpp | 2 +- modules/gapi/test/common/gapi_imgproc_tests.cpp | 2 +- modules/gapi/test/common/gapi_operators_tests.cpp | 2 +- modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp | 2 +- modules/gapi/test/internal/gapi_int_backend_tests.cpp | 4 ++-- modules/gapi/test/internal/gapi_int_executor_tests.cpp | 2 +- modules/gapi/test/internal/gapi_int_garg_test.cpp | 2 +- modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp | 2 +- modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp | 2 +- modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp | 4 ++-- modules/gapi/test/internal/gapi_int_island_tests.cpp | 2 +- modules/gapi/test/internal/gapi_int_recompilation_test.cpp | 2 +- modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp | 4 ++-- modules/gapi/test/internal/gapi_int_vectorref_test.cpp | 2 +- modules/gapi/test/internal/gapi_transactions_test.cpp | 2 +- modules/gapi/test/own/gapi_types_tests.cpp | 2 +- modules/gapi/test/own/mat_tests.cpp | 2 +- modules/gapi/test/own/scalar_tests.cpp | 2 +- modules/gapi/test/util/any_tests.cpp | 2 +- modules/gapi/test/util/optional_tests.cpp | 2 +- modules/gapi/test/util/variant_tests.cpp | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/gapi/perf/common/gapi_core_perf_tests.cpp b/modules/gapi/perf/common/gapi_core_perf_tests.cpp index 2df4d88906..2c075c760a 100644 --- a/modules/gapi/perf/common/gapi_core_perf_tests.cpp +++ b/modules/gapi/perf/common/gapi_core_perf_tests.cpp @@ -5,5 +5,5 @@ // Copyright (C) 2018 Intel Corporation -#include "perf_precomp.hpp" +#include "../perf_precomp.hpp" #include "gapi_core_perf_tests_inl.hpp" diff --git a/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp b/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp index 5a2ffb88a2..a3ccb15e50 100644 --- a/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp +++ b/modules/gapi/perf/common/gapi_imgproc_perf_tests.cpp @@ -5,5 +5,5 @@ // Copyright (C) 2018 Intel Corporation -#include "perf_precomp.hpp" +#include "../perf_precomp.hpp" #include "gapi_imgproc_perf_tests_inl.hpp" diff --git a/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp b/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp index 48786b6a96..e476e22648 100644 --- a/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp +++ b/modules/gapi/perf/internal/gapi_compiler_perf_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "perf_precomp.hpp" +#include "../perf_precomp.hpp" #include "../../test/common/gapi_tests_common.hpp" namespace opencv_test diff --git a/modules/gapi/test/common/gapi_compoundkernel_tests.cpp b/modules/gapi/test/common/gapi_compoundkernel_tests.cpp index 1f5de7a920..d1d8793da3 100644 --- a/modules/gapi/test/common/gapi_compoundkernel_tests.cpp +++ b/modules/gapi/test/common/gapi_compoundkernel_tests.cpp @@ -7,7 +7,7 @@ // FIXME: move out from Common -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/cpu/core.hpp" #include diff --git a/modules/gapi/test/common/gapi_core_tests.cpp b/modules/gapi/test/common/gapi_core_tests.cpp index eb77612485..ea697b28dc 100644 --- a/modules/gapi/test/common/gapi_core_tests.cpp +++ b/modules/gapi/test/common/gapi_core_tests.cpp @@ -5,5 +5,5 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "gapi_core_tests_inl.hpp" diff --git a/modules/gapi/test/common/gapi_imgproc_tests.cpp b/modules/gapi/test/common/gapi_imgproc_tests.cpp index b7c0279086..f9660e7b00 100644 --- a/modules/gapi/test/common/gapi_imgproc_tests.cpp +++ b/modules/gapi/test/common/gapi_imgproc_tests.cpp @@ -5,5 +5,5 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "gapi_imgproc_tests_inl.hpp" diff --git a/modules/gapi/test/common/gapi_operators_tests.cpp b/modules/gapi/test/common/gapi_operators_tests.cpp index 1f6f0ce20f..dc62be8a34 100644 --- a/modules/gapi/test/common/gapi_operators_tests.cpp +++ b/modules/gapi/test/common/gapi_operators_tests.cpp @@ -5,5 +5,5 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "gapi_operators_tests_inl.hpp" diff --git a/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp b/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp index 4179fa53b0..b3e54bb85a 100644 --- a/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp +++ b/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "../common/gapi_operators_tests.hpp" #define CORE_FLUID cv::gapi::core::fluid::kernels() diff --git a/modules/gapi/test/internal/gapi_int_backend_tests.cpp b/modules/gapi/test/internal/gapi_int_backend_tests.cpp index 67b6273138..0a60285a29 100644 --- a/modules/gapi/test/internal/gapi_int_backend_tests.cpp +++ b/modules/gapi/test/internal/gapi_int_backend_tests.cpp @@ -5,8 +5,8 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" -#include "gapi_mock_kernels.hpp" +#include "../test_precomp.hpp" +#include "../gapi_mock_kernels.hpp" #include "compiler/gmodel.hpp" #include "compiler/gcompiler.hpp" diff --git a/modules/gapi/test/internal/gapi_int_executor_tests.cpp b/modules/gapi/test/internal/gapi_int_executor_tests.cpp index 20aad89b66..1a465b3ddb 100644 --- a/modules/gapi/test/internal/gapi_int_executor_tests.cpp +++ b/modules/gapi/test/internal/gapi_int_executor_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" namespace opencv_test { diff --git a/modules/gapi/test/internal/gapi_int_garg_test.cpp b/modules/gapi/test/internal/gapi_int_garg_test.cpp index 67696dbb03..e66a644900 100644 --- a/modules/gapi/test/internal/gapi_int_garg_test.cpp +++ b/modules/gapi/test/internal/gapi_int_garg_test.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" namespace opencv_test { // Tests on T/Kind matching //////////////////////////////////////////////////// diff --git a/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp b/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp index 2a3ff5e47a..3f88d6445a 100644 --- a/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp +++ b/modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "api/gcomputation_priv.hpp" diff --git a/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp b/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp index a815e0d22d..f5de114863 100644 --- a/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp +++ b/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include // util::indexed diff --git a/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp b/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp index 7fdb1bc5ab..33f0eebefe 100644 --- a/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp +++ b/modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp @@ -5,10 +5,10 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "compiler/transactions.hpp" -#include "gapi_mock_kernels.hpp" +#include "../gapi_mock_kernels.hpp" #include "compiler/gmodel.hpp" #include "compiler/gislandmodel.hpp" diff --git a/modules/gapi/test/internal/gapi_int_island_tests.cpp b/modules/gapi/test/internal/gapi_int_island_tests.cpp index d59300663d..06a5b8c7dd 100644 --- a/modules/gapi/test/internal/gapi_int_island_tests.cpp +++ b/modules/gapi/test/internal/gapi_int_island_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "compiler/gmodel.hpp" #include "compiler/gcompiled_priv.hpp" diff --git a/modules/gapi/test/internal/gapi_int_recompilation_test.cpp b/modules/gapi/test/internal/gapi_int_recompilation_test.cpp index 252af9c1a8..833ea17789 100644 --- a/modules/gapi/test/internal/gapi_int_recompilation_test.cpp +++ b/modules/gapi/test/internal/gapi_int_recompilation_test.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "api/gcomputation_priv.hpp" #include "opencv2/gapi/fluid/gfluidkernel.hpp" diff --git a/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp b/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp index d4b16f627e..c0411f4d4f 100644 --- a/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp +++ b/modules/gapi/test/internal/gapi_int_resolve_kernel_test.cpp @@ -5,9 +5,9 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" -#include "gapi_mock_kernels.hpp" +#include "../gapi_mock_kernels.hpp" namespace opencv_test { diff --git a/modules/gapi/test/internal/gapi_int_vectorref_test.cpp b/modules/gapi/test/internal/gapi_int_vectorref_test.cpp index 53c800f43e..1b6698ba5d 100644 --- a/modules/gapi/test/internal/gapi_int_vectorref_test.cpp +++ b/modules/gapi/test/internal/gapi_int_vectorref_test.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" namespace opencv_test { diff --git a/modules/gapi/test/internal/gapi_transactions_test.cpp b/modules/gapi/test/internal/gapi_transactions_test.cpp index f550340e81..ac77c33d13 100644 --- a/modules/gapi/test/internal/gapi_transactions_test.cpp +++ b/modules/gapi/test/internal/gapi_transactions_test.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include #include "compiler/transactions.hpp" diff --git a/modules/gapi/test/own/gapi_types_tests.cpp b/modules/gapi/test/own/gapi_types_tests.cpp index c254357074..d84319079e 100644 --- a/modules/gapi/test/own/gapi_types_tests.cpp +++ b/modules/gapi/test/own/gapi_types_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/own/types.hpp" namespace opencv_test diff --git a/modules/gapi/test/own/mat_tests.cpp b/modules/gapi/test/own/mat_tests.cpp index ba2cd2df4f..a6453c62c0 100644 --- a/modules/gapi/test/own/mat_tests.cpp +++ b/modules/gapi/test/own/mat_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/own/mat.hpp" #include //suppress_unused_warning diff --git a/modules/gapi/test/own/scalar_tests.cpp b/modules/gapi/test/own/scalar_tests.cpp index a9c5c01235..0ee626cc73 100644 --- a/modules/gapi/test/own/scalar_tests.cpp +++ b/modules/gapi/test/own/scalar_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/own/scalar.hpp" namespace opencv_test diff --git a/modules/gapi/test/util/any_tests.cpp b/modules/gapi/test/util/any_tests.cpp index 60bbcc13b6..1c6c9cc0a7 100644 --- a/modules/gapi/test/util/any_tests.cpp +++ b/modules/gapi/test/util/any_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/util/any.hpp" namespace opencv_test diff --git a/modules/gapi/test/util/optional_tests.cpp b/modules/gapi/test/util/optional_tests.cpp index b7fabd530c..7b6cdb1f21 100644 --- a/modules/gapi/test/util/optional_tests.cpp +++ b/modules/gapi/test/util/optional_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/util/optional.hpp" #include //suppress_unused_warning diff --git a/modules/gapi/test/util/variant_tests.cpp b/modules/gapi/test/util/variant_tests.cpp index a95b6aa80b..328afe7c9f 100644 --- a/modules/gapi/test/util/variant_tests.cpp +++ b/modules/gapi/test/util/variant_tests.cpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "test_precomp.hpp" +#include "../test_precomp.hpp" #include "opencv2/gapi/util/variant.hpp" #include //std::max_align_t