summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-09 15:30:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-09-09 15:30:50 (GMT)
commitf281c6214ba932e5a5c9d8bae67313fc8bfa8ec9 (patch)
tree92226f985c7d40aa60a063eb66806a1fa1ebab73 /Tests/RunCMake
parenta3d384881b58975939289b3fac3158acb4dda09c (diff)
parent9cdf6ef48d62fed477cc9cf48995d7c91382f5f6 (diff)
downloadCMake-f281c6214ba932e5a5c9d8bae67313fc8bfa8ec9.zip
CMake-f281c6214ba932e5a5c9d8bae67313fc8bfa8ec9.tar.gz
CMake-f281c6214ba932e5a5c9d8bae67313fc8bfa8ec9.tar.bz2
Merge topic 'more-swift2-fixes'
9cdf6ef4 Swift: Add proper Swift compiler test 1aa29f0d Swift: Remove positive Swift language tests d778a1c2 Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10 4da60024 Swift: Fix Compiler-Id detection for Swift 2 874a265c Swift: Make SwiftMix compatible with Swift 2
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/Swift/Enable-stdout.txt1
-rw-r--r--Tests/RunCMake/Swift/Enable.cmake1
-rw-r--r--Tests/RunCMake/Swift/RunCMakeTest.cmake2
3 files changed, 0 insertions, 4 deletions
diff --git a/Tests/RunCMake/Swift/Enable-stdout.txt b/Tests/RunCMake/Swift/Enable-stdout.txt
deleted file mode 100644
index 39e133f..0000000
--- a/Tests/RunCMake/Swift/Enable-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- The Swift compiler identification is Apple
diff --git a/Tests/RunCMake/Swift/Enable.cmake b/Tests/RunCMake/Swift/Enable.cmake
deleted file mode 100644
index 19f297a..0000000
--- a/Tests/RunCMake/Swift/Enable.cmake
+++ /dev/null
@@ -1 +0,0 @@
-enable_language(Swift)
diff --git a/Tests/RunCMake/Swift/RunCMakeTest.cmake b/Tests/RunCMake/Swift/RunCMakeTest.cmake
index 0a57121..4864295 100644
--- a/Tests/RunCMake/Swift/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Swift/RunCMakeTest.cmake
@@ -3,8 +3,6 @@ include(RunCMake)
if(RunCMake_GENERATOR STREQUAL Xcode)
if(XCODE_BELOW_6_1)
run_cmake(XcodeTooOld)
- else()
- run_cmake(Enable)
endif()
else()
run_cmake(NotSupported)