Merge topic 'cleanup-style'

68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)

1 files changed, 40 insertions, 40 deletions

diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index 4166d99..f1bfc75 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -6,7 +6,7 @@
 #  SUBVERSION_FOUND - same as Subversion_FOUND, set for compatiblity reasons
 #
 # The minimum required version of Subversion can be specified using the
-# standard syntax, e.g. FIND_PACKAGE(Subversion 1.4)
+# standard syntax, e.g. find_package(Subversion 1.4)
 #
 # If the command line client executable is found two macros are defined:
 #  Subversion_WC_INFO(<dir> <var-prefix>)
@@ -25,13 +25,13 @@
 # variable:
 #  <var-prefix>_LAST_CHANGED_LOG - last log of base revision
 # Example usage:
-#  FIND_PACKAGE(Subversion)
-#  IF(SUBVERSION_FOUND)
+#  find_package(Subversion)
+#  if(SUBVERSION_FOUND)
 #    Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-#    MESSAGE("Current revision is ${Project_WC_REVISION}")
+#    message("Current revision is ${Project_WC_REVISION}")
 #    Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
-#    MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
-#  ENDIF(SUBVERSION_FOUND)
+#    message("Last changed log is ${Project_LAST_CHANGED_LOG}")
+#  endif()
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -47,85 +47,85 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn
+find_program(Subversion_SVN_EXECUTABLE svn
   DOC "subversion command line client")
-MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
+mark_as_advanced(Subversion_SVN_EXECUTABLE)
 
-IF(Subversion_SVN_EXECUTABLE)
+if(Subversion_SVN_EXECUTABLE)
   # the subversion commands should be executed with the C locale, otherwise
   # the message (which are parsed) may be translated, Alex
-  SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
-  SET(ENV{LC_ALL} C)
+  set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
+  set(ENV{LC_ALL} C)
 
-  EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
+  execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} --version
     OUTPUT_VARIABLE Subversion_VERSION_SVN
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   # restore the previous LC_ALL
-  SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
+  set(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
 
-  STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
+  string(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
     "\\2" Subversion_VERSION_SVN "${Subversion_VERSION_SVN}")
 
-  MACRO(Subversion_WC_INFO dir prefix)
+  macro(Subversion_WC_INFO dir prefix)
     # the subversion commands should be executed with the C locale, otherwise
     # the message (which are parsed) may be translated, Alex
-    SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
-    SET(ENV{LC_ALL} C)
+    set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
+    set(ENV{LC_ALL} C)
 
-    EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} info ${dir}
+    execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} info ${dir}
       OUTPUT_VARIABLE ${prefix}_WC_INFO
       ERROR_VARIABLE Subversion_svn_info_error
       RESULT_VARIABLE Subversion_svn_info_result
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    IF(NOT ${Subversion_svn_info_result} EQUAL 0)
-      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
-    ELSE(NOT ${Subversion_svn_info_result} EQUAL 0)
+    if(NOT ${Subversion_svn_info_result} EQUAL 0)
+      message(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
+    else()
 
-      STRING(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
+      string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
         "\\2" ${prefix}_WC_URL "${${prefix}_WC_INFO}")
-      STRING(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
+      string(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
         "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}")
-      STRING(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
+      string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
         "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
-      STRING(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
+      string(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
         "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
-      STRING(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
+      string(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
         "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
-      STRING(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
+      string(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
         "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
 
-    ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0)
+    endif()
 
     # restore the previous LC_ALL
-    SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
+    set(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})
 
-  ENDMACRO(Subversion_WC_INFO)
+  endmacro()
 
-  MACRO(Subversion_WC_LOG dir prefix)
+  macro(Subversion_WC_LOG dir prefix)
     # This macro can block if the certificate is not signed:
     # svn ask you to accept the certificate and wait for your answer
     # This macro requires a svn server network access (Internet most of the time)
     # and can also be slow since it access the svn server
-    EXECUTE_PROCESS(COMMAND
+    execute_process(COMMAND
       ${Subversion_SVN_EXECUTABLE} --non-interactive log -r BASE ${dir}
       OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG
       ERROR_VARIABLE Subversion_svn_log_error
       RESULT_VARIABLE Subversion_svn_log_result
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    IF(NOT ${Subversion_svn_log_result} EQUAL 0)
-      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
-    ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
-  ENDMACRO(Subversion_WC_LOG)
+    if(NOT ${Subversion_svn_log_result} EQUAL 0)
+      message(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
+    endif()
+  endmacro()
 
-ENDIF(Subversion_SVN_EXECUTABLE)
+endif()
 
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion REQUIRED_VARS Subversion_SVN_EXECUTABLE
                                              VERSION_VAR Subversion_VERSION_SVN )
 
 # for compatibility
-SET(Subversion_FOUND ${SUBVERSION_FOUND})
-SET(Subversion_SVN_FOUND ${SUBVERSION_FOUND})
+set(Subversion_FOUND ${SUBVERSION_FOUND})
+set(Subversion_SVN_FOUND ${SUBVERSION_FOUND})