summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler/Clang-CXX.cmake
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-12 20:43:48 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-01-15 21:13:21 (GMT)
commita60027a642f887179513496ef61552db44829652 (patch)
tree2eb8b49e97e74b7b1f78490a85d59fbca6a0304c /Modules/Compiler/Clang-CXX.cmake
parent06ff525492b32cd3182c185c908c526379766912 (diff)
downloadCMake-a60027a642f887179513496ef61552db44829652.zip
CMake-a60027a642f887179513496ef61552db44829652.tar.gz
CMake-a60027a642f887179513496ef61552db44829652.tar.bz2
Features: Ensure appropriate return value from feature test macros.
GNU-CXX already has complex logic and sets the _result to 0 before tests which may set it to something else. Change the other modules to be consistent with that.
Diffstat (limited to 'Modules/Compiler/Clang-CXX.cmake')
-rw-r--r--Modules/Compiler/Clang-CXX.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 6fe0b56..e07eace 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -38,6 +38,7 @@ macro(cmake_record_cxx_compile_features)
record_compiler_features(CXX "${std_version}" ${list})
endmacro()
+ set(_result 0)
if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
_get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
if (_result EQUAL 0)
@@ -46,7 +47,5 @@ macro(cmake_record_cxx_compile_features)
if (_result EQUAL 0)
_get_clang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
endif()
- else()
- set(_result 0)
endif()
endmacro()