diff options
| author | Brad King <brad.king@kitware.com> | 2012-07-10 14:55:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-07-10 15:05:04 (GMT) |
| commit | 2e99949ccb216c59ff1932bc3773654e9ae54419 (patch) | |
| tree | e0a7ee0de24eab9b10f1fcfceead009d0faf2f3b /Tests/RunCMake/include | |
| parent | 6274ca6f910683495124d22e371a1adc9cf0eebc (diff) | |
| download | CMake-2e99949ccb216c59ff1932bc3773654e9ae54419.zip CMake-2e99949ccb216c59ff1932bc3773654e9ae54419.tar.gz CMake-2e99949ccb216c59ff1932bc3773654e9ae54419.tar.bz2 | |
include: Ignore empty string as file name (#13388)
Previously CMake silently accepted the empty string and added a bogus
dependency on the current directory. Instead warn about the empty file
name and ignore it. We cannot make this an error because there may be
existing projects that accidentally depend on the old behavior.
Add a RunCMake.include test to cover this case.
Diffstat (limited to 'Tests/RunCMake/include')
| -rw-r--r-- | Tests/RunCMake/include/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/include/EmptyString-stderr.txt | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/include/EmptyString.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/include/EmptyStringOptional-stderr.txt | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/include/EmptyStringOptional.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/include/RunCMakeTest.cmake | 4 |
6 files changed, 19 insertions, 0 deletions
diff --git a/Tests/RunCMake/include/CMakeLists.txt b/Tests/RunCMake/include/CMakeLists.txt new file mode 100644 index 0000000..e8db6b0 --- /dev/null +++ b/Tests/RunCMake/include/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 2.8) +project(${RunCMake_TEST} NONE) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/include/EmptyString-stderr.txt b/Tests/RunCMake/include/EmptyString-stderr.txt new file mode 100644 index 0000000..006c647 --- /dev/null +++ b/Tests/RunCMake/include/EmptyString-stderr.txt @@ -0,0 +1,5 @@ +CMake Warning \(dev\) at EmptyString.cmake:1 \(include\): + include\(\) given empty file name \(ignored\). +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/include/EmptyString.cmake b/Tests/RunCMake/include/EmptyString.cmake new file mode 100644 index 0000000..4285cb3 --- /dev/null +++ b/Tests/RunCMake/include/EmptyString.cmake @@ -0,0 +1 @@ +include("") diff --git a/Tests/RunCMake/include/EmptyStringOptional-stderr.txt b/Tests/RunCMake/include/EmptyStringOptional-stderr.txt new file mode 100644 index 0000000..b61c679 --- /dev/null +++ b/Tests/RunCMake/include/EmptyStringOptional-stderr.txt @@ -0,0 +1,5 @@ +CMake Warning \(dev\) at EmptyStringOptional.cmake:1 \(include\): + include\(\) given empty file name \(ignored\). +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) +This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/include/EmptyStringOptional.cmake b/Tests/RunCMake/include/EmptyStringOptional.cmake new file mode 100644 index 0000000..549d46b --- /dev/null +++ b/Tests/RunCMake/include/EmptyStringOptional.cmake @@ -0,0 +1 @@ +include("" OPTIONAL) diff --git a/Tests/RunCMake/include/RunCMakeTest.cmake b/Tests/RunCMake/include/RunCMakeTest.cmake new file mode 100644 index 0000000..59b87ca --- /dev/null +++ b/Tests/RunCMake/include/RunCMakeTest.cmake @@ -0,0 +1,4 @@ +include(RunCMake) + +run_cmake(EmptyString) +run_cmake(EmptyStringOptional) |