summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2010-12-28 15:58:20 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2010-12-28 15:58:20 (GMT)
commit960ace1e0b5e1b4c699304b01c465e5b8f01bdbd (patch)
treec31f178de7cb94581d1cdc134e1ae53d20048197
parent060d6e885e5a8c2828f97a1164ed01119dbe9244 (diff)
downloadCMake-960ace1e0b5e1b4c699304b01c465e5b8f01bdbd.zip
CMake-960ace1e0b5e1b4c699304b01c465e5b8f01bdbd.tar.gz
CMake-960ace1e0b5e1b4c699304b01c465e5b8f01bdbd.tar.bz2
Add testing for windows resources for mingw/msys/cygwin and remove for watcom.
This commit should test windows resources on all platforms where they are supported now.
-rw-r--r--Tests/CMakeLists.txt13
1 files changed, 12 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8f29641..6099758 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -131,7 +131,18 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(TarTest TarTest)
ADD_TEST_MACRO(SystemInformation SystemInformation)
ADD_TEST_MACRO(MathTest MathTest)
- IF(MSVC)
+ # assume no resources building to test
+ SET(TEST_RESOURCES FALSE)
+ # for windows and cygwin assume we have resources
+ IF(WIN32 OR CYGWIN)
+ SET(TEST_RESOURCES TRUE)
+ ENDIF()
+ # for borland and watcom there is no resource support
+ IF(("${CMAKE_TEST_GENERATOR}" MATCHES "WMake") OR
+ ("${CMAKE_TEST_GENERATOR}" MATCHES "Borland"))
+ SET(TEST_RESOURCES FALSE)
+ ENDIF()
+ IF(TEST_RESOURCES)
ADD_TEST_MACRO(VSResource VSResource)
ENDIF()
ADD_TEST_MACRO(Simple Simple)