summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2011-08-10 22:19:20 (GMT)
committerStephen Kelly <steveire@gmail.com>2011-08-10 22:19:53 (GMT)
commit1c6b41bee7fb1e2b85be4ab3497889ab72089f69 (patch)
tree1733196f7b150440c8782c63a8a58b0f8fa3e1a2
parent3f7e03643d5437ec494956f2678c7b3c905d8250 (diff)
downloadCMake-1c6b41bee7fb1e2b85be4ab3497889ab72089f69.zip
CMake-1c6b41bee7fb1e2b85be4ab3497889ab72089f69.tar.gz
CMake-1c6b41bee7fb1e2b85be4ab3497889ab72089f69.tar.bz2
Remember to surround the other deprecated test in the Borland check.
-rw-r--r--Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
index a41b168..168cae8 100644
--- a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt
@@ -11,5 +11,8 @@ static_build_pass("Libstatic l; return l.libstatic_exported();" "Failed to build
if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland)
static_build_fail("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
+ static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
+else()
+ static_build_pass("Libstatic l; return l.libstatic_deprecated();" "Built use of deprecated class method. This should not be possible.")
+ static_build_pass("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")
endif()
-static_build_fail("libstatic_deprecated();" "Built use of deprecated function. This should not be possible.")