summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2013-08-09 16:21:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-09 16:28:34 +0200
commitdcd10c004f4d5d974e4a7f2c68f08c6ed1214702 (patch)
tree158340fa4ecf3b5411c4edc785a2eb659ce3d897
parent7ae0dd75ab7f2ebbf692bf33df42587819b6579b (diff)
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 <sergio.ahumada@digia.com>
-rw-r--r--src/corelib/Qt5CTestMacros.cmake8
1 files changed, 8 insertions, 0 deletions
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()