summaryrefslogtreecommitdiffstats
path: root/Source/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-10-01 19:18:21 (GMT)
committerBrad King <brad.king@kitware.com>2012-10-01 19:18:21 (GMT)
commita61f633737067da7d765c5e479a7d6754d4a083a (patch)
treeb62dd41469e20b4bb7d777b3f40a0761968ff9d1 /Source/CMakeLists.txt
parent8c55ea017e671223d7acc01f5121b6b45c697c2a (diff)
parent4075e1ca6ccd01183c9bb582a2291c5abc70a828 (diff)
downloadCMake-a61f633737067da7d765c5e479a7d6754d4a083a.zip
CMake-a61f633737067da7d765c5e479a7d6754d4a083a.tar.gz
CMake-a61f633737067da7d765c5e479a7d6754d4a083a.tar.bz2
Merge branch 'master' into import-KWSys-subtree
Diffstat (limited to 'Source/CMakeLists.txt')
-rw-r--r--Source/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index c01c490..46bdec6 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -337,6 +337,8 @@ IF (WIN32)
cmGlobalVisualStudio11Generator.cxx
cmGlobalVisualStudio11Win64Generator.h
cmGlobalVisualStudio11Win64Generator.cxx
+ cmGlobalVisualStudio11ARMGenerator.h
+ cmGlobalVisualStudio11ARMGenerator.cxx
cmGlobalVisualStudioGenerator.cxx
cmGlobalVisualStudioGenerator.h
cmGlobalWatcomWMakeGenerator.cxx
@@ -423,6 +425,9 @@ SET(CTEST_SRCS cmCTest.cxx
CTest/cmCTestConfigureHandler.cxx
CTest/cmCTestCoverageCommand.cxx
CTest/cmCTestCoverageHandler.cxx
+ CTest/cmParseMumpsCoverage.cxx
+ CTest/cmParseCacheCoverage.cxx
+ CTest/cmParseGTMCoverage.cxx
CTest/cmParsePHPCoverage.cxx
CTest/cmCTestEmptyBinaryDirectoryCommand.cxx
CTest/cmCTestGenericHandler.cxx