diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-21 18:27:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-21 18:29:10 (GMT) |
| commit | 3b09398ae27f0e4b5975920ac2787427ffc6ccc4 (patch) | |
| tree | 0222213d02f770bd5d611815045805d6fb215e6d /Tests | |
| parent | 265b9db7c2c865c5aad821bf9a377ea84dfe431e (diff) | |
| download | CMake-3b09398ae27f0e4b5975920ac2787427ffc6ccc4.zip CMake-3b09398ae27f0e4b5975920ac2787427ffc6ccc4.tar.gz CMake-3b09398ae27f0e4b5975920ac2787427ffc6ccc4.tar.bz2 | |
Tests: Teach RunCMake.export to enable languages only when needed
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/export/AppendExport-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/export/AppendExport.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/export/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/export/OldIface-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/export/OldIface.cmake | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/Tests/RunCMake/export/AppendExport-stderr.txt b/Tests/RunCMake/export/AppendExport-stderr.txt index 6e385d4..d71620e 100644 --- a/Tests/RunCMake/export/AppendExport-stderr.txt +++ b/Tests/RunCMake/export/AppendExport-stderr.txt @@ -1,4 +1,4 @@ -CMake Error at AppendExport.cmake:8 \(export\): +CMake Error at AppendExport.cmake:[0-9]+ \(export\): export EXPORT signature does not recognise the APPEND option. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/export/AppendExport.cmake b/Tests/RunCMake/export/AppendExport.cmake index f36010b..2a99dfc 100644 --- a/Tests/RunCMake/export/AppendExport.cmake +++ b/Tests/RunCMake/export/AppendExport.cmake @@ -1,3 +1,4 @@ +enable_language(CXX) add_library(foo empty.cpp) export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake") install(TARGETS foo EXPORT fooExport diff --git a/Tests/RunCMake/export/CMakeLists.txt b/Tests/RunCMake/export/CMakeLists.txt index be9d403..12cd3c7 100644 --- a/Tests/RunCMake/export/CMakeLists.txt +++ b/Tests/RunCMake/export/CMakeLists.txt @@ -1,3 +1,3 @@ cmake_minimum_required(VERSION 2.8.4) -project(${RunCMake_TEST}) +project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/export/OldIface-stderr.txt b/Tests/RunCMake/export/OldIface-stderr.txt index afb4ae3..818c2cb 100644 --- a/Tests/RunCMake/export/OldIface-stderr.txt +++ b/Tests/RunCMake/export/OldIface-stderr.txt @@ -1,4 +1,4 @@ -CMake Error at OldIface.cmake:8 \(export\): +CMake Error at OldIface.cmake:[0-9]+ \(export\): export EXPORT signature does not recognise the EXPORT_LINK_INTERFACE_LIBRARIES option. Call Stack \(most recent call first\): diff --git a/Tests/RunCMake/export/OldIface.cmake b/Tests/RunCMake/export/OldIface.cmake index 5fb8e25..833b023 100644 --- a/Tests/RunCMake/export/OldIface.cmake +++ b/Tests/RunCMake/export/OldIface.cmake @@ -1,3 +1,4 @@ +enable_language(CXX) add_library(foo empty.cpp) export(TARGETS foo FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake") install(TARGETS foo EXPORT fooExport |