From dcd10c004f4d5d974e4a7f2c68f08c6ed1214702 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 9 Aug 2013 16:21:10 +0200 Subject: [PATCH] Forward the correct compilers to the actual cmake tests. This was missing from commit 87db2fdef (Use the compilers used by Qt for the CMake tests., 2013-07-19) Task-number: QTQAINFRA-609 Change-Id: Ief1f0ed11d9f6268c636dc739fbf7945c5dee2c8 Reviewed-by: Sergio Ahumada --- src/corelib/Qt5CTestMacros.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index 71097aadbf..cea514ff52 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -19,6 +19,14 @@ endforeach() set(BUILD_OPTIONS_LIST) +if (CMAKE_C_COMPILER) + list(APPEND BUILD_OPTIONS_LIST "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}") +endif() + +if (CMAKE_CXX_COMPILER) + list(APPEND BUILD_OPTIONS_LIST "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") +endif() + if (CMAKE_BUILD_TYPE) list(APPEND BUILD_OPTIONS_LIST "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif()