summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-08-08 13:32:44 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-08-08 13:32:44 (GMT)
commit5484f1bc0cdbd9f42048f07a02e92a1ca75c2980 (patch)
treee8952f9e2be2d90442fe1fa92ebb723337e2ea9e
parent8576d61989b186154ee240082c79a0a9bb054331 (diff)
downloadCMake-5484f1bc0cdbd9f42048f07a02e92a1ca75c2980.zip
CMake-5484f1bc0cdbd9f42048f07a02e92a1ca75c2980.tar.gz
CMake-5484f1bc0cdbd9f42048f07a02e92a1ca75c2980.tar.bz2
ENH: also specify the C++ compiler for mingw
Alex
-rw-r--r--Tests/CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5379ab2..e56f0f2 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -742,8 +742,9 @@ IF(BUILD_TESTING)
ENDIF(SDCC_EXECUTABLE)
- FIND_PROGRAM(MINGW_LINUX2WIN_EXECUTABLE i586-mingw32msvc-gcc)
- IF(MINGW_LINUX2WIN_EXECUTABLE)
+ FIND_PROGRAM(MINGW_CC_LINUX2WIN_EXECUTABLE i586-mingw32msvc-gcc)
+ FIND_PROGRAM(MINGW_CXX_LINUX2WIN_EXECUTABLE i586-mingw32msvc-g++)
+ IF(MINGW_CC_LINUX2WIN_EXECUTABLE AND MINGW_CXX_LINUX2WIN_EXECUTABLE)
ADD_TEST(Simple_Mingw_Linux2Win ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Simple"
@@ -753,8 +754,9 @@ IF(BUILD_TESTING)
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-options
"-DCMAKE_SYSTEM_NAME=Windows"
- "-DCMAKE_C_COMPILER=${MINGW_LINUX2WIN_EXECUTABLE}")
- ENDIF(MINGW_LINUX2WIN_EXECUTABLE)
+ "-DCMAKE_C_COMPILER=${MINGW_CC_LINUX2WIN_EXECUTABLE}"
+ "-DCMAKE_CXX_COMPILER=${MINGW_CXX_LINUX2WIN_EXECUTABLE}")
+ ENDIF(MINGW_CC_LINUX2WIN_EXECUTABLE AND MINGW_CXX_LINUX2WIN_EXECUTABLE)
ENDIF(CMAKE_TEST_GENERATOR MATCHES "Makefiles" OR CMAKE_TEST_GENERATOR MATCHES "KDevelop")