summaryrefslogtreecommitdiff
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-04 15:44:07 -0500
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-04 15:44:07 -0500
commit3556ab9f724589c53a9d00fa7c4ee6236e5b6e2f (patch)
treeee55ad78f0edec9872d8f18d2ae14996d579726d /Tests
parentf1d7a5600fab0d3cd314fd9ae059010ea6f7e5b9 (diff)
parent971692c0559ad908f7a1177fbe62d273945601db (diff)
downloadcmake-3556ab9f724589c53a9d00fa7c4ee6236e5b6e2f.tar.gz
Merge topic 'add_support_for_windres'
971692c Build enable_language command during bootstrap 960ace1 Add testing for windows resources for mingw/msys/cygwin and remove for watcom. 060d6e8 Add support for windres to cygwin. b2f308c Add support for windows resources with mingw/msys.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt13
1 files changed, 12 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 911b2477d9..464fe2afa7 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)