diff options
author | Brad King <brad.king@kitware.com> | 2014-11-03 14:08:35 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-03 14:08:35 (GMT) |
commit | 6aa2d4773701d5b491c44e2c0eda202b46b36521 (patch) | |
tree | b6522a78a9e58e57bb3d3cf592d178b5aa691f24 /Tests/RunCMake | |
parent | 44853be608a18c94a1ce4000446ec7f29b8f0ee3 (diff) | |
parent | 1531df2b866df9aa52dc54219a4552e94f47b622 (diff) | |
download | CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.zip CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.tar.gz CMake-6aa2d4773701d5b491c44e2c0eda202b46b36521.tar.bz2 |
Merge topic 'fix-configure_file-COPYONLY'
1531df2b configure_file: Warn about unknown arguments
4abbb140 Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLY
bd7ba8e2 KWSys: Fix configure_file call to use COPYONLY, not COPY_ONLY
e9282782 Help: Fix configure_file call to use COPYONLY, not COPY_ONLY
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r-- | Tests/RunCMake/configure_file/RunCMakeTest.cmake | 1 | ||||
-rw-r--r-- | Tests/RunCMake/configure_file/UnknownArg-stderr.txt | 10 | ||||
-rw-r--r-- | Tests/RunCMake/configure_file/UnknownArg.cmake | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Tests/RunCMake/configure_file/RunCMakeTest.cmake b/Tests/RunCMake/configure_file/RunCMakeTest.cmake index c8bfa57..c010256 100644 --- a/Tests/RunCMake/configure_file/RunCMakeTest.cmake +++ b/Tests/RunCMake/configure_file/RunCMakeTest.cmake @@ -6,3 +6,4 @@ run_cmake(UTF16LE-BOM) run_cmake(UTF16BE-BOM) run_cmake(UTF32LE-BOM) run_cmake(UTF32BE-BOM) +run_cmake(UnknownArg) diff --git a/Tests/RunCMake/configure_file/UnknownArg-stderr.txt b/Tests/RunCMake/configure_file/UnknownArg-stderr.txt new file mode 100644 index 0000000..46930c0 --- /dev/null +++ b/Tests/RunCMake/configure_file/UnknownArg-stderr.txt @@ -0,0 +1,10 @@ +CMake Warning \(dev\) at UnknownArg.cmake:1 \(configure_file\): + configure_file called with unknown argument\(s\): + + COPY_ONLY + COPYFILE + COPY_FILE + +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/configure_file/UnknownArg.cmake b/Tests/RunCMake/configure_file/UnknownArg.cmake new file mode 100644 index 0000000..5125c83 --- /dev/null +++ b/Tests/RunCMake/configure_file/UnknownArg.cmake @@ -0,0 +1,2 @@ +configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in UnknownArg.txt + @ONLY COPYONLY COPY_ONLY COPYFILE COPY_FILE) |