From a60027a642f887179513496ef61552db44829652 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 12 Jan 2015 21:43:48 +0100
Subject: 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.
---
 Modules/Compiler/AppleClang-C.cmake   | 3 +--
 Modules/Compiler/AppleClang-CXX.cmake | 3 +--
 Modules/Compiler/Clang-C.cmake        | 3 +--
 Modules/Compiler/Clang-CXX.cmake      | 3 +--
 Modules/Compiler/GNU-C.cmake          | 3 +--
 Modules/Compiler/GNU-CXX.cmake        | 2 --
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 0665745..16f420f 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -19,6 +19,7 @@ macro(cmake_record_c_compile_features)
     record_compiler_features(C "${std_version}" ${list})
   endmacro()
 
+  set(_result 0)
   if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
     _get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
@@ -27,7 +28,5 @@ macro(cmake_record_c_compile_features)
     if (_result EQUAL 0)
       _get_appleclang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
     endif()
-  else()
-    set(_result 0)
   endif()
 endmacro()
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index a508623..978c382 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -26,6 +26,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 4.0)
     set(_result 0)
     if(CMAKE_CXX14_STANDARD_COMPILE_OPTION)
@@ -37,7 +38,5 @@ macro(cmake_record_cxx_compile_features)
     if (_result EQUAL 0)
       _get_appleclang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
     endif()
-  else()
-    set(_result 0)
   endif()
 endmacro()
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
index ebd5c43..548d0a5 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -28,6 +28,7 @@ macro(cmake_record_c_compile_features)
     record_compiler_features(C "${std_version}" ${list})
   endmacro()
 
+  set(_result 0)
   if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
     _get_clang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
@@ -36,7 +37,5 @@ macro(cmake_record_c_compile_features)
     if (_result EQUAL 0)
       _get_clang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
     endif()
-  else()
-    set(_result 0)
   endif()
 endmacro()
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()
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index db9089d..3404d22 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -23,6 +23,7 @@ macro(cmake_record_c_compile_features)
     record_compiler_features(C "${std_version}" ${list})
   endmacro()
 
+  set(_result 0)
   if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
     _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
     if (_result EQUAL 0)
@@ -31,7 +32,5 @@ macro(cmake_record_c_compile_features)
     if (_result EQUAL 0)
       _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
     endif()
-  else()
-    set(_result 0)
   endif()
 endmacro()
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 4a26963..6ade85a 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -49,7 +49,5 @@ macro(cmake_record_cxx_compile_features)
     if (_result EQUAL 0)
       _get_gcc_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
     endif()
-  else()
-    set(_result 0)
   endif()
 endmacro()
-- 
cgit v0.12