summaryrefslogtreecommitdiffstats
path: root/Tests/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-03-16 14:20:20 (GMT)
committerBrad King <brad.king@kitware.com>2012-03-16 14:20:20 (GMT)
commit2693dbe085d78951f62487e37e7d75eb4cf7bfdd (patch)
treea36e0a734a680861d3fcdfe4b6203b32ee640b70 /Tests/CMakeLists.txt
parent51997cb6dc93eff826e95ac326eb9af6763eaa32 (diff)
parentcd146c650e092dcbf91adf60ef697608c2ac7fa2 (diff)
downloadCMake-2693dbe085d78951f62487e37e7d75eb4cf7bfdd.zip
CMake-2693dbe085d78951f62487e37e7d75eb4cf7bfdd.tar.gz
CMake-2693dbe085d78951f62487e37e7d75eb4cf7bfdd.tar.bz2
Merge branch 'object-library' into ninja-object-library
Diffstat (limited to 'Tests/CMakeLists.txt')
-rw-r--r--Tests/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5f125a4..c0b7cd6 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -199,6 +199,7 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(CxxOnly CxxOnly)
ADD_TEST_MACRO(IPO COnly/COnly)
ADD_TEST_MACRO(OutDir runtime/OutDir)
+ ADD_TEST_MACRO(ObjectLibrary UseCshared)
ADD_TEST_MACRO(NewlineArgs NewlineArgs)
ADD_TEST_MACRO(SetLang SetLang)
ADD_TEST_MACRO(ExternalOBJ ExternalOBJ)