From 69df0eee77a3ec19d37dff0722f1924de37e7fda Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 23 Mar 2017 18:12:48 +0300 Subject: [PATCH] cmake: fix try_compile() with --coverage flags --- CMakeLists.txt | 4 ++++ cmake/OpenCVCompilerOptions.cmake | 1 + cmake/OpenCVUtils.cmake | 1 + 3 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68fb108423..7d044583bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,10 @@ if(POLICY CMP0051) cmake_policy(SET CMP0051 NEW) endif() +if(POLICY CMP0056) + cmake_policy(SET CMP0056 NEW) +endif() + include(cmake/OpenCVUtils.cmake) # must go before the project command diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index 0eb68b656e..1656840441 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -192,6 +192,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) if(ENABLE_COVERAGE) set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} --coverage") set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} --coverage") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") endif() if(ENABLE_INSTRUMENTATION) diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake index 935bfc2a01..4c065d66f4 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -260,6 +260,7 @@ MACRO(ocv_check_compiler_flag LANG FLAG RESULT) TRY_COMPILE(${RESULT} "${CMAKE_BINARY_DIR}" "${_fname}" + CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}" # CMP0056 do this on new CMake COMPILE_DEFINITIONS "${FLAG}" OUTPUT_VARIABLE OUTPUT) -- GitLab