diff options
author | Brad King <brad.king@kitware.com> | 2013-10-15 13:32:36 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-15 13:32:36 (GMT) |
commit | 06491955ebe566e025b25abaa91977824811e282 (patch) | |
tree | c835e87d2cfc40b88617921c0738a8fe42af502f /Tests | |
parent | ebffbda4476aae1e89029f2e24fd76a22765205a (diff) | |
parent | a4263c9f6447e526886d6af301b84c9097c097fa (diff) | |
download | CMake-06491955ebe566e025b25abaa91977824811e282.zip CMake-06491955ebe566e025b25abaa91977824811e282.tar.gz CMake-06491955ebe566e025b25abaa91977824811e282.tar.bz2 |
Merge topic 'export-at-generate-time'
a4263c9 export(): Handle multiple dependent export sets.
66b290e export(): Process the export() command at generate time.
5fe5c32 export(): Set a Makefile on the cmExportBuildFileGenerator.
e383555 cmExportInstallFileGenerator: Fix comment to match reality.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt | 2 | ||||
-rw-r--r-- | Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt | 4 | ||||
-rw-r--r-- | Tests/RunCMake/ExportWithoutLanguage/header.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt index ae7627e..405dd8d 100644 --- a/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt +++ b/Tests/RunCMake/CMP0022/CMP0022-export-stderr.txt @@ -1,4 +1,4 @@ -CMake Error at CMP0022-export.cmake:11 \(export\): +CMake Error in CMakeLists.txt: Target "cmp0022NEW" has policy CMP0022 enabled, but also has old-style LINK_INTERFACE_LIBRARIES properties populated, but it was exported without the EXPORT_LINK_INTERFACE_LIBRARIES to export the old-style properties diff --git a/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt index 67a0ae3..5658d85 100644 --- a/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt +++ b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt @@ -1,6 +1,4 @@ CMake Error: CMake can not determine linker language for target: NoLanguage -CMake Error at NoLanguage.cmake:2 \(export\): +CMake Error in CMakeLists.txt: Exporting the target "NoLanguage" is not allowed since its linker language cannot be determined -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/ExportWithoutLanguage/header.h b/Tests/RunCMake/ExportWithoutLanguage/header.h new file mode 100644 index 0000000..0c803ed --- /dev/null +++ b/Tests/RunCMake/ExportWithoutLanguage/header.h @@ -0,0 +1,2 @@ + +enum some_compilers { need_more_than_nothing }; |