diff options
| author | Stephen Kelly <steveire@gmail.com> | 2011-08-11 16:17:12 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2011-08-11 16:17:12 (GMT) |
| commit | 9554e1013ef5d9971092ed0cd45daf59b8a6bd87 (patch) | |
| tree | 586fd50f5b2df1590506a2ebc920ed3395b9a661 /Tests/Module | |
| parent | 1590d5fe4f95a800635ba9078e822d742a96dc18 (diff) | |
| download | CMake-9554e1013ef5d9971092ed0cd45daf59b8a6bd87.zip CMake-9554e1013ef5d9971092ed0cd45daf59b8a6bd87.tar.gz CMake-9554e1013ef5d9971092ed0cd45daf59b8a6bd87.tar.bz2 | |
Split the deprecated available check from setting macro values.
Diffstat (limited to 'Tests/Module')
3 files changed, 3 insertions, 3 deletions
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt index d25eed0..1401eec 100644 --- a/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/lib_shared_and_statictest/CMakeLists.txt @@ -17,7 +17,7 @@ endmacro() static_variant_build_pass("return libshared_and_static_exported();" "Failed to build static variant") shared_variant_build_pass("return libshared_and_static_exported();" "Failed to build shared variant") -if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland) +if (COMPILER_HAS_DEPRECATED) shared_variant_build_fail("return libshared_and_static_deprecated();" "Built shared deprecated variant") static_variant_build_fail("return libshared_and_static_deprecated();" "Built static deprecated variant") else() diff --git a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt index 9edc53f..b763036 100644 --- a/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/libsharedtest/CMakeLists.txt @@ -9,7 +9,7 @@ endmacro() shared_build_pass("Libshared l; return l.libshared_exported();" "Failed to build exported") -if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland) +if (COMPILER_HAS_DEPRECATED) shared_build_fail("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.") else() shared_build_pass("Libshared l; return l.libshared_deprecated();" "Built use of deprecated class method. This should not be possible.") diff --git a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt index 168cae8..14ca05b 100644 --- a/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/libstatictest/CMakeLists.txt @@ -9,7 +9,7 @@ endmacro() static_build_pass("Libstatic l; return l.libstatic_exported();" "Failed to build exported.") -if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES Borland) +if (COMPILER_HAS_DEPRECATED) 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() |