kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GetProperty test: move doc property tests into main process 

They will not raise an error in the normal case so we do not need to run them
in their own process.
This commit is contained in:
Rolf Eike Beer 2012-10-08 19:31:59 +02:00
parent 56125a3f36
commit 82106e3783
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/CMakeTests/GetProperty-Doc-Properties.cmake
View File

@ -1,10 +0,0 @@
get_property(FOO_BRIEF GLOBAL PROPERTY FOO BRIEF_DOCS)
get_property(FOO_FULL GLOBAL PROPERTY FOO FULL_DOCS)
if (NOT FOO_BRIEF STREQUAL "NOTFOUND")
message(SEND_ERROR "property FOO has BRIEF_DOCS set to '${FOO_BRIEF}'")
endif ()
if (NOT FOO_FULL STREQUAL "NOTFOUND")
message(SEND_ERROR "property FOO has FULL_DOCS set to '${FOO_FULL}'")
endif ()

17
Tests/CMakeTests/GetPropertyTest.cmake.in
View File

@ -1,5 +1,16 @@
include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake")
get_property(FOO_BRIEF GLOBAL PROPERTY FOO BRIEF_DOCS)
get_property(FOO_FULL GLOBAL PROPERTY FOO FULL_DOCS)
if (NOT FOO_BRIEF STREQUAL "NOTFOUND")
message(SEND_ERROR "property FOO has BRIEF_DOCS set to '${FOO_BRIEF}'")
endif ()
if (NOT FOO_FULL STREQUAL "NOTFOUND")
message(SEND_ERROR "property FOO has FULL_DOCS set to '${FOO_FULL}'")
endif ()
set(Missing-Argument-RESULT 1) set(Missing-Argument-RESULT 1)
set(Missing-Argument-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Missing-Argument.cmake:1 \\(get_property\\):.*get_property called with incorrect number of arguments.*") set(Missing-Argument-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Missing-Argument.cmake:1 \\(get_property\\):.*get_property called with incorrect number of arguments.*")
@ -28,12 +39,6 @@ check_cmake_test(GetProperty
No-Property No-Property
) )
set(Doc-Properties-RESULT 0)
check_cmake_test(GetProperty
Doc-Properties
)
set(Global-Name-RESULT 1) set(Global-Name-RESULT 1)
set(Global-Name-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Global-Name.cmake:1 \\(get_property\\):.*get_property given name for GLOBAL scope\\..*") set(Global-Name-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?GetProperty-Global-Name.cmake:1 \\(get_property\\):.*get_property given name for GLOBAL scope\\..*")