Convert CMake-language commands to lower case

Ancient CMake versions required upper-case commands.  Later command
names became case-insensitive.  Now the preferred style is lower-case.

Run the following shell code:

cmake --help-command-list |
grep -v "cmake version" |
while read c; do
    echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed

1 files changed, 356 insertions, 356 deletions

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index bf45dc6..b1a17a8 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -4,7 +4,7 @@
 # modules that you will use, you need to name them as components to
 # the package:
 #
-# FIND_PACKAGE(wxWidgets COMPONENTS core base ...)
+# find_package(wxWidgets COMPONENTS core base ...)
 #
 # There are two search branches: a windows style and a unix style. For
 # windows, the following variables are searched for and set to
@@ -38,7 +38,7 @@
 # example, to use the base toolkit found in the /usr/local path, set
 # the variable (before calling the FIND_PACKAGE command) as such:
 #
-#  SET(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr)
+#  set(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr)
 #
 # The following are set after the configuration is done for both
 # windows and unix style:
@@ -62,18 +62,18 @@
 #
 # Sample usage:
 #   # Note that for MinGW users the order of libs is important!
-#   FIND_PACKAGE(wxWidgets COMPONENTS net gl core base)
-#   IF(wxWidgets_FOUND)
-#     INCLUDE(${wxWidgets_USE_FILE})
+#   find_package(wxWidgets COMPONENTS net gl core base)
+#   if(wxWidgets_FOUND)
+#     include(${wxWidgets_USE_FILE})
 #     # and for each of your dependent executable/library targets:
-#     TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
-#   ENDIF(wxWidgets_FOUND)
+#     target_link_libraries(<YourTarget> ${wxWidgets_LIBRARIES})
+#   endif(wxWidgets_FOUND)
 #
 # If wxWidgets is required (i.e., not an optional part):
-#   FIND_PACKAGE(wxWidgets REQUIRED net gl core base)
-#   INCLUDE(${wxWidgets_USE_FILE})
+#   find_package(wxWidgets REQUIRED net gl core base)
+#   include(${wxWidgets_USE_FILE})
 #   # and for each of your dependent executable/library targets:
-#   TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES})
+#   target_link_libraries(<YourTarget> ${wxWidgets_LIBRARIES})
 
 #=============================================================================
 # Copyright 2004-2009 Kitware, Inc.
@@ -94,7 +94,7 @@
 #        Remember to connect back to the upper text.
 # Sample usage with monolithic wx build:
 #
-#   FIND_PACKAGE(wxWidgets COMPONENTS mono)
+#   find_package(wxWidgets COMPONENTS mono)
 #   ...
 
 # NOTES
@@ -143,21 +143,21 @@
 #
 # Helper macro to control the debugging output globally. There are
 # two versions for controlling how verbose your output should be.
-MACRO(DBG_MSG _MSG)
-#  MESSAGE(STATUS
+macro(DBG_MSG _MSG)
+#  message(STATUS
 #    "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-ENDMACRO(DBG_MSG)
-MACRO(DBG_MSG_V _MSG)
-#  MESSAGE(STATUS
+endmacro(DBG_MSG)
+macro(DBG_MSG_V _MSG)
+#  message(STATUS
 #    "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-ENDMACRO(DBG_MSG_V)
+endmacro(DBG_MSG_V)
 
 # Clear return values in case the module is loaded more than once.
-SET(wxWidgets_FOUND FALSE)
-SET(wxWidgets_INCLUDE_DIRS "")
-SET(wxWidgets_LIBRARIES    "")
-SET(wxWidgets_LIBRARY_DIRS "")
-SET(wxWidgets_CXX_FLAGS    "")
+set(wxWidgets_FOUND FALSE)
+set(wxWidgets_INCLUDE_DIRS "")
+set(wxWidgets_LIBRARIES    "")
+set(wxWidgets_LIBRARY_DIRS "")
+set(wxWidgets_CXX_FLAGS    "")
 
 # Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on
 # the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM
@@ -167,9 +167,9 @@ SET(wxWidgets_CXX_FLAGS    "")
 #   http://www.cmake.org/pipermail/cmake/2008-April/021115.html
 #   http://www.cmake.org/pipermail/cmake/2008-April/021146.html
 #
-IF(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
-  SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
-ENDIF()
+if(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
+  set(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
+endif()
 
 # DEPRECATED: This is a patch to support the DEPRECATED use of
 # wxWidgets_USE_LIBS.
@@ -177,9 +177,9 @@ ENDIF()
 # If wxWidgets_USE_LIBS is set:
 # - if using <components>, then override wxWidgets_USE_LIBS
 # - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS
-IF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
-  SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
-ENDIF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+if(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+  set(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
+endif(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
 DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
 
 # Add the convenience use file if available.
@@ -187,50 +187,50 @@ DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
 # Get dir of this file which may reside in:
 # - CMAKE_MAKE_ROOT/Modules on CMake installation
 # - CMAKE_MODULE_PATH if user prefers his own specialized version
-SET(wxWidgets_USE_FILE "")
-GET_FILENAME_COMPONENT(
+set(wxWidgets_USE_FILE "")
+get_filename_component(
   wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 # Prefer an existing customized version, but the user might override
 # the FindwxWidgets module and not the UsewxWidgets one.
-IF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-  SET(wxWidgets_USE_FILE
+if(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+  set(wxWidgets_USE_FILE
     "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-ELSE(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
-  SET(wxWidgets_USE_FILE UsewxWidgets)
-ENDIF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+else(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+  set(wxWidgets_USE_FILE UsewxWidgets)
+endif(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
 
 #=====================================================================
 #=====================================================================
-IF(WIN32 AND NOT CYGWIN AND NOT MSYS)
-  SET(wxWidgets_FIND_STYLE "win32")
-ELSE(WIN32 AND NOT CYGWIN AND NOT MSYS)
-  IF(UNIX OR MSYS)
-    SET(wxWidgets_FIND_STYLE "unix")
-  ENDIF(UNIX OR MSYS)
-ENDIF(WIN32 AND NOT CYGWIN AND NOT MSYS)
+if(WIN32 AND NOT CYGWIN AND NOT MSYS)
+  set(wxWidgets_FIND_STYLE "win32")
+else(WIN32 AND NOT CYGWIN AND NOT MSYS)
+  if(UNIX OR MSYS)
+    set(wxWidgets_FIND_STYLE "unix")
+  endif(UNIX OR MSYS)
+endif(WIN32 AND NOT CYGWIN AND NOT MSYS)
 
 #=====================================================================
 # WIN32_FIND_STYLE
 #=====================================================================
-IF(wxWidgets_FIND_STYLE STREQUAL "win32")
+if(wxWidgets_FIND_STYLE STREQUAL "win32")
   # Useful common wx libs needed by almost all components.
-  SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
+  set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
 
-  # DEPRECATED: Use FIND_PACKAGE(wxWidgets COMPONENTS mono) instead.
-  IF(NOT wxWidgets_FIND_COMPONENTS)
-    IF(wxWidgets_USE_MONOLITHIC)
-      SET(wxWidgets_FIND_COMPONENTS mono)
-    ELSE(wxWidgets_USE_MONOLITHIC)
-      SET(wxWidgets_FIND_COMPONENTS core base) # this is default
-    ENDIF(wxWidgets_USE_MONOLITHIC)
-  ENDIF(NOT wxWidgets_FIND_COMPONENTS)
+  # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
+  if(NOT wxWidgets_FIND_COMPONENTS)
+    if(wxWidgets_USE_MONOLITHIC)
+      set(wxWidgets_FIND_COMPONENTS mono)
+    else(wxWidgets_USE_MONOLITHIC)
+      set(wxWidgets_FIND_COMPONENTS core base) # this is default
+    endif(wxWidgets_USE_MONOLITHIC)
+  endif(NOT wxWidgets_FIND_COMPONENTS)
 
   # Add the common (usually required libs) unless
   # wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set.
-  IF(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
-    LIST(APPEND wxWidgets_FIND_COMPONENTS
+  if(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
+    list(APPEND wxWidgets_FIND_COMPONENTS
       ${wxWidgets_COMMON_LIBRARIES})
-  ENDIF(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
+  endif(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
 
   #-------------------------------------------------------------------
   # WIN32: Helper MACROS
@@ -240,19 +240,19 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
   #   if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
   #   if _CONFIGURATION = mswu,      then _UNV="",   _UCD=u _DBG=""
   #
-  MACRO(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
-    STRING(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
-    STRING(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
-    IF(${_UCD} STREQUAL ${_CONFIGURATION})
-      SET(${_UCD} "")
-    ENDIF(${_UCD} STREQUAL ${_CONFIGURATION})
-    STRING(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
-  ENDMACRO(WX_GET_NAME_COMPONENTS)
+  macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
+    string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
+    string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
+    if(${_UCD} STREQUAL ${_CONFIGURATION})
+      set(${_UCD} "")
+    endif(${_UCD} STREQUAL ${_CONFIGURATION})
+    string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
+  endmacro(WX_GET_NAME_COMPONENTS)
 
   #
   # Find libraries associated to a configuration.
   #
-  MACRO(WX_FIND_LIBS _UNV _UCD _DBG)
+  macro(WX_FIND_LIBS _UNV _UCD _DBG)
     DBG_MSG_V("m_unv = ${_UNV}")
     DBG_MSG_V("m_ucd = ${_UCD}")
     DBG_MSG_V("m_dbg = ${_DBG}")
@@ -260,19 +260,19 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     # FIXME: What if both regex libs are available. regex should be
     # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
     # Find wxWidgets common libraries.
-    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
-      FIND_LIBRARY(WX_${LIB}${_DBG}
+    foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
+      find_library(WX_${LIB}${_DBG}
         NAMES
         wx${LIB}${_UCD}${_DBG} # for regex
         wx${LIB}${_DBG}
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
-      MARK_AS_ADVANCED(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
+      mark_as_advanced(WX_${LIB}${_DBG})
+    endforeach(LIB)
 
     # Find wxWidgets multilib base libraries.
-    FIND_LIBRARY(WX_base${_DBG}
+    find_library(WX_base${_DBG}
       NAMES
       wxbase29${_UCD}${_DBG}
       wxbase28${_UCD}${_DBG}
@@ -282,9 +282,9 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
       PATHS ${WX_LIB_DIR}
       NO_DEFAULT_PATH
       )
-    MARK_AS_ADVANCED(WX_base${_DBG})
-    FOREACH(LIB net odbc xml)
-      FIND_LIBRARY(WX_${LIB}${_DBG}
+    mark_as_advanced(WX_base${_DBG})
+    foreach(LIB net odbc xml)
+      find_library(WX_${LIB}${_DBG}
         NAMES
         wxbase29${_UCD}${_DBG}_${LIB}
         wxbase28${_UCD}${_DBG}_${LIB}
@@ -294,11 +294,11 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
-      MARK_AS_ADVANCED(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
+      mark_as_advanced(WX_${LIB}${_DBG})
+    endforeach(LIB)
 
     # Find wxWidgets monolithic library.
-    FIND_LIBRARY(WX_mono${_DBG}
+    find_library(WX_mono${_DBG}
       NAMES
       wxmsw${_UNV}29${_UCD}${_DBG}
       wxmsw${_UNV}28${_UCD}${_DBG}
@@ -308,12 +308,12 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
       PATHS ${WX_LIB_DIR}
       NO_DEFAULT_PATH
       )
-    MARK_AS_ADVANCED(WX_mono${_DBG})
+    mark_as_advanced(WX_mono${_DBG})
 
     # Find wxWidgets multilib libraries.
-    FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+    foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
                 stc ribbon propgrid webview)
-      FIND_LIBRARY(WX_${LIB}${_DBG}
+      find_library(WX_${LIB}${_DBG}
         NAMES
         wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
@@ -323,102 +323,102 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
-      MARK_AS_ADVANCED(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-  ENDMACRO(WX_FIND_LIBS)
+      mark_as_advanced(WX_${LIB}${_DBG})
+    endforeach(LIB)
+  endmacro(WX_FIND_LIBS)
 
   #
   # Clear all library paths, so that FIND_LIBRARY refinds them.
   #
   # Clear a lib, reset its found flag, and mark as advanced.
-  MACRO(WX_CLEAR_LIB _LIB)
-    SET(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
-    SET(${_LIB}_FOUND FALSE)
-    MARK_AS_ADVANCED(${_LIB})
-  ENDMACRO(WX_CLEAR_LIB)
+  macro(WX_CLEAR_LIB _LIB)
+    set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
+    set(${_LIB}_FOUND FALSE)
+    mark_as_advanced(${_LIB})
+  endmacro(WX_CLEAR_LIB)
   # Clear all debug or release library paths (arguments are "d" or "").
-  MACRO(WX_CLEAR_ALL_LIBS _DBG)
+  macro(WX_CLEAR_ALL_LIBS _DBG)
     # Clear wxWidgets common libraries.
-    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
+    foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
       WX_CLEAR_LIB(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
+    endforeach(LIB)
 
     # Clear wxWidgets multilib base libraries.
     WX_CLEAR_LIB(WX_base${_DBG})
-    FOREACH(LIB net odbc xml)
+    foreach(LIB net odbc xml)
       WX_CLEAR_LIB(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
+    endforeach(LIB)
 
     # Clear wxWidgets monolithic library.
     WX_CLEAR_LIB(WX_mono${_DBG})
 
     # Clear wxWidgets multilib libraries.
-    FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+    foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
                 stc ribbon propgrid)
       WX_CLEAR_LIB(WX_${LIB}${_DBG})
-    ENDFOREACH(LIB)
-  ENDMACRO(WX_CLEAR_ALL_LIBS)
+    endforeach(LIB)
+  endmacro(WX_CLEAR_ALL_LIBS)
   # Clear all wxWidgets debug libraries.
-  MACRO(WX_CLEAR_ALL_DBG_LIBS)
+  macro(WX_CLEAR_ALL_DBG_LIBS)
     WX_CLEAR_ALL_LIBS("d")
-  ENDMACRO(WX_CLEAR_ALL_DBG_LIBS)
+  endmacro(WX_CLEAR_ALL_DBG_LIBS)
   # Clear all wxWidgets release libraries.
-  MACRO(WX_CLEAR_ALL_REL_LIBS)
+  macro(WX_CLEAR_ALL_REL_LIBS)
     WX_CLEAR_ALL_LIBS("")
-  ENDMACRO(WX_CLEAR_ALL_REL_LIBS)
+  endmacro(WX_CLEAR_ALL_REL_LIBS)
 
   #
   # Set the wxWidgets_LIBRARIES variable.
   # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails.
   #
-  MACRO(WX_SET_LIBRARIES _LIBS _DBG)
+  macro(WX_SET_LIBRARIES _LIBS _DBG)
     DBG_MSG_V("Looking for ${${_LIBS}}")
-    IF(WX_USE_REL_AND_DBG)
-      FOREACH(LIB ${${_LIBS}})
+    if(WX_USE_REL_AND_DBG)
+      foreach(LIB ${${_LIBS}})
         DBG_MSG_V("Searching for ${LIB} and ${LIB}d")
         DBG_MSG_V("WX_${LIB}  : ${WX_${LIB}}")
         DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}")
-        IF(WX_${LIB} AND WX_${LIB}d)
+        if(WX_${LIB} AND WX_${LIB}d)
           DBG_MSG_V("Found ${LIB} and ${LIB}d")
-          LIST(APPEND wxWidgets_LIBRARIES
+          list(APPEND wxWidgets_LIBRARIES
             debug ${WX_${LIB}d} optimized ${WX_${LIB}}
             )
-        ELSE(WX_${LIB} AND WX_${LIB}d)
+        else(WX_${LIB} AND WX_${LIB}d)
           DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(WX_${LIB} AND WX_${LIB}d)
-      ENDFOREACH(LIB)
-    ELSE(WX_USE_REL_AND_DBG)
-      FOREACH(LIB ${${_LIBS}})
+          set(wxWidgets_FOUND FALSE)
+        endif(WX_${LIB} AND WX_${LIB}d)
+      endforeach(LIB)
+    else(WX_USE_REL_AND_DBG)
+      foreach(LIB ${${_LIBS}})
         DBG_MSG_V("Searching for ${LIB}${_DBG}")
         DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}")
-        IF(WX_${LIB}${_DBG})
+        if(WX_${LIB}${_DBG})
           DBG_MSG_V("Found ${LIB}${_DBG}")
-          LIST(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
-        ELSE(WX_${LIB}${_DBG})
+          list(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
+        else(WX_${LIB}${_DBG})
           DBG_MSG_V(
             "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(WX_${LIB}${_DBG})
-      ENDFOREACH(LIB)
-    ENDIF(WX_USE_REL_AND_DBG)
+          set(wxWidgets_FOUND FALSE)
+        endif(WX_${LIB}${_DBG})
+      endforeach(LIB)
+    endif(WX_USE_REL_AND_DBG)
 
     DBG_MSG_V("OpenGL")
-    LIST(FIND ${_LIBS} gl WX_USE_GL)
-    IF(NOT WX_USE_GL EQUAL -1)
+    list(FIND ${_LIBS} gl WX_USE_GL)
+    if(NOT WX_USE_GL EQUAL -1)
       DBG_MSG_V("- is required.")
-      LIST(APPEND wxWidgets_LIBRARIES opengl32 glu32)
-    ENDIF(NOT WX_USE_GL EQUAL -1)
+      list(APPEND wxWidgets_LIBRARIES opengl32 glu32)
+    endif(NOT WX_USE_GL EQUAL -1)
 
-    LIST(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
-  ENDMACRO(WX_SET_LIBRARIES)
+    list(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
+  endmacro(WX_SET_LIBRARIES)
 
   #-------------------------------------------------------------------
   # WIN32: Start actual work.
   #-------------------------------------------------------------------
 
   # Look for an installation tree.
-  FIND_PATH(wxWidgets_ROOT_DIR
+  find_path(wxWidgets_ROOT_DIR
     NAMES include/wx/wx.h
     PATHS
       $ENV{wxWidgets_ROOT_DIR}
@@ -462,24 +462,24 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     )
 
   # If wxWidgets_ROOT_DIR changed, clear lib dir.
-  IF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
-    SET(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
+  if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+    set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
         CACHE INTERNAL "wxWidgets_ROOT_DIR")
-    SET(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
+    set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
         CACHE PATH "Cleared." FORCE)
-  ENDIF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+  endif(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
 
-  IF(WX_ROOT_DIR)
+  if(WX_ROOT_DIR)
     # Select one default tree inside the already determined wx tree.
     # Prefer static/shared order usually consistent with build
     # settings.
-    IF(MINGW)
-      SET(WX_LIB_DIR_PREFIX gcc)
-    ELSE(MINGW)
-      SET(WX_LIB_DIR_PREFIX vc)
-    ENDIF(MINGW)
-    IF(BUILD_SHARED_LIBS)
-      FIND_PATH(wxWidgets_LIB_DIR
+    if(MINGW)
+      set(WX_LIB_DIR_PREFIX gcc)
+    else(MINGW)
+      set(WX_LIB_DIR_PREFIX vc)
+    endif(MINGW)
+    if(BUILD_SHARED_LIBS)
+      find_path(wxWidgets_LIB_DIR
         NAMES
           msw/wx/setup.h
           mswd/wx/setup.h
@@ -495,8 +495,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         DOC "Path to wxWidgets libraries?"
         NO_DEFAULT_PATH
         )
-    ELSE(BUILD_SHARED_LIBS)
-      FIND_PATH(wxWidgets_LIB_DIR
+    else(BUILD_SHARED_LIBS)
+      find_path(wxWidgets_LIB_DIR
         NAMES
           msw/wx/setup.h
           mswd/wx/setup.h
@@ -512,202 +512,202 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         DOC "Path to wxWidgets libraries?"
         NO_DEFAULT_PATH
         )
-    ENDIF(BUILD_SHARED_LIBS)
+    endif(BUILD_SHARED_LIBS)
 
     # If wxWidgets_LIB_DIR changed, clear all libraries.
-    IF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
-      SET(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
+    if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+      set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
       WX_CLEAR_ALL_DBG_LIBS()
       WX_CLEAR_ALL_REL_LIBS()
-    ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+    endif(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
 
-    IF(WX_LIB_DIR)
+    if(WX_LIB_DIR)
       # If building shared libs, define WXUSINGDLL to use dllimport.
-      IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
-        SET(wxWidgets_DEFINITIONS WXUSINGDLL)
+      if(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+        set(wxWidgets_DEFINITIONS WXUSINGDLL)
         DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
-      ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+      endif(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
 
       # Search for available configuration types.
-      FOREACH(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
-        SET(WX_${CFG}_FOUND FALSE)
-        IF(EXISTS ${WX_LIB_DIR}/${CFG})
-          LIST(APPEND WX_CONFIGURATION_LIST ${CFG})
-          SET(WX_${CFG}_FOUND TRUE)
-          SET(WX_CONFIGURATION ${CFG})
-        ENDIF(EXISTS ${WX_LIB_DIR}/${CFG})
-      ENDFOREACH(CFG)
+      foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
+        set(WX_${CFG}_FOUND FALSE)
+        if(EXISTS ${WX_LIB_DIR}/${CFG})
+          list(APPEND WX_CONFIGURATION_LIST ${CFG})
+          set(WX_${CFG}_FOUND TRUE)
+          set(WX_CONFIGURATION ${CFG})
+        endif(EXISTS ${WX_LIB_DIR}/${CFG})
+      endforeach(CFG)
       DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
 
-      IF(WX_CONFIGURATION)
-        SET(wxWidgets_FOUND TRUE)
+      if(WX_CONFIGURATION)
+        set(wxWidgets_FOUND TRUE)
 
         # If the selected configuration wasn't found force the default
         # one. Otherwise, use it but still force a refresh for
         # updating the doc string with the current list of available
         # configurations.
-        IF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
-          SET(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
+        if(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+          set(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
             "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
-        ELSE(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
-          SET(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
+        else(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+          set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
             "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
-        ENDIF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+        endif(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
 
         # If release config selected, and both release/debug exist.
-        IF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
-          OPTION(wxWidgets_USE_REL_AND_DBG
+        if(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+          option(wxWidgets_USE_REL_AND_DBG
             "Use release and debug configurations?" TRUE)
-          SET(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
-        ELSE(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+          set(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
+        else(WX_${wxWidgets_CONFIGURATION}d_FOUND)
           # If the option exists (already in cache), force it false.
-          IF(wxWidgets_USE_REL_AND_DBG)
-            SET(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
+          if(wxWidgets_USE_REL_AND_DBG)
+            set(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
               "No ${wxWidgets_CONFIGURATION}d found." FORCE)
-          ENDIF(wxWidgets_USE_REL_AND_DBG)
-          SET(WX_USE_REL_AND_DBG FALSE)
-        ENDIF(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+          endif(wxWidgets_USE_REL_AND_DBG)
+          set(WX_USE_REL_AND_DBG FALSE)
+        endif(WX_${wxWidgets_CONFIGURATION}d_FOUND)
 
         # Get configuration parameters from the name.
         WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
 
         # Set wxWidgets lib setup include directory.
-        IF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
-          SET(wxWidgets_INCLUDE_DIRS
+        if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+          set(wxWidgets_INCLUDE_DIRS
             ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
-        ELSE(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+        else(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
           DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+          set(wxWidgets_FOUND FALSE)
+        endif(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
 
         # Set wxWidgets main include directory.
-        IF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
-          LIST(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
-        ELSE(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+        if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+          list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
+        else(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
           DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h")
-          SET(wxWidgets_FOUND FALSE)
-        ENDIF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+          set(wxWidgets_FOUND FALSE)
+        endif(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
 
         # Find wxWidgets libraries.
         WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
-        IF(WX_USE_REL_AND_DBG)
+        if(WX_USE_REL_AND_DBG)
           WX_FIND_LIBS("${UNV}" "${UCD}" "d")
-        ENDIF(WX_USE_REL_AND_DBG)
+        endif(WX_USE_REL_AND_DBG)
 
         # Settings for requested libs (i.e., include dir, libraries, etc.).
         WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
 
         # Add necessary definitions for unicode builds
-        IF("${UCD}" STREQUAL "u")
-          LIST(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
-        ENDIF("${UCD}" STREQUAL "u")
+        if("${UCD}" STREQUAL "u")
+          list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
+        endif("${UCD}" STREQUAL "u")
 
         # Add necessary definitions for debug builds
-        SET(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
+        set(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
 
-      ENDIF(WX_CONFIGURATION)
-    ENDIF(WX_LIB_DIR)
-  ENDIF(WX_ROOT_DIR)
+      endif(WX_CONFIGURATION)
+    endif(WX_LIB_DIR)
+  endif(WX_ROOT_DIR)
 
 #=====================================================================
 # UNIX_FIND_STYLE
 #=====================================================================
-ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
-  IF(wxWidgets_FIND_STYLE STREQUAL "unix")
+else(wxWidgets_FIND_STYLE STREQUAL "win32")
+  if(wxWidgets_FIND_STYLE STREQUAL "unix")
     #-----------------------------------------------------------------
     # UNIX: Helper MACROS
     #-----------------------------------------------------------------
     #
     # Set the default values based on "wx-config --selected-config".
     #
-    MACRO(WX_CONFIG_SELECT_GET_DEFAULT)
-      EXECUTE_PROCESS(
+    macro(WX_CONFIG_SELECT_GET_DEFAULT)
+      execute_process(
         COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
           ${wxWidgets_CONFIG_OPTIONS} --selected-config
         OUTPUT_VARIABLE _wx_selected_config
         RESULT_VARIABLE _wx_result
         ERROR_QUIET
         )
-      IF(_wx_result EQUAL 0)
-        FOREACH(_opt_name debug static unicode universal)
-          STRING(TOUPPER ${_opt_name} _upper_opt_name)
-          IF(_wx_selected_config MATCHES ".*${_opt_name}.*")
-            SET(wxWidgets_DEFAULT_${_upper_opt_name} ON)
-          ELSE(_wx_selected_config MATCHES ".*${_opt_name}.*")
-            SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
-          ENDIF(_wx_selected_config MATCHES ".*${_opt_name}.*")
-        ENDFOREACH(_opt_name)
-      ELSE(_wx_result EQUAL 0)
-        FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
-          SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
-        ENDFOREACH(_upper_opt_name)
-      ENDIF(_wx_result EQUAL 0)
-    ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT)
+      if(_wx_result EQUAL 0)
+        foreach(_opt_name debug static unicode universal)
+          string(TOUPPER ${_opt_name} _upper_opt_name)
+          if(_wx_selected_config MATCHES ".*${_opt_name}.*")
+            set(wxWidgets_DEFAULT_${_upper_opt_name} ON)
+          else(_wx_selected_config MATCHES ".*${_opt_name}.*")
+            set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+          endif(_wx_selected_config MATCHES ".*${_opt_name}.*")
+        endforeach(_opt_name)
+      else(_wx_result EQUAL 0)
+        foreach(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
+          set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+        endforeach(_upper_opt_name)
+      endif(_wx_result EQUAL 0)
+    endmacro(WX_CONFIG_SELECT_GET_DEFAULT)
 
     #
     # Query a boolean configuration option to determine if the system
     # has both builds available. If so, provide the selection option
     # to the user.
     #
-    MACRO(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
-      EXECUTE_PROCESS(
+    macro(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
+      execute_process(
         COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
           ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes
         RESULT_VARIABLE _wx_result_yes
         OUTPUT_QUIET
         ERROR_QUIET
         )
-      EXECUTE_PROCESS(
+      execute_process(
         COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
           ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=no
         RESULT_VARIABLE _wx_result_no
         OUTPUT_QUIET
         ERROR_QUIET
         )
-      STRING(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
-      IF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
-        OPTION(wxWidgets_USE_${_UPPER_OPT_NAME}
+      string(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
+      if(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+        option(wxWidgets_USE_${_UPPER_OPT_NAME}
           ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}})
-      ELSE(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+      else(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
         # If option exists (already in cache), force to available one.
-        IF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
-          IF(_wx_result_yes EQUAL 0)
-            SET(wxWidgets_USE_${_UPPER_OPT_NAME} ON  CACHE BOOL ${_OPT_HELP} FORCE)
-          ELSE(_wx_result_yes EQUAL 0)
-            SET(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
-          ENDIF(_wx_result_yes EQUAL 0)
-        ENDIF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
-      ENDIF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
-    ENDMACRO(WX_CONFIG_SELECT_QUERY_BOOL)
+        if(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+          if(_wx_result_yes EQUAL 0)
+            set(wxWidgets_USE_${_UPPER_OPT_NAME} ON  CACHE BOOL ${_OPT_HELP} FORCE)
+          else(_wx_result_yes EQUAL 0)
+            set(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
+          endif(_wx_result_yes EQUAL 0)
+        endif(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+      endif(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+    endmacro(WX_CONFIG_SELECT_QUERY_BOOL)
 
     #
     # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting
     # among multiple builds.
     #
-    MACRO(WX_CONFIG_SELECT_SET_OPTIONS)
-      SET(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS})
-      FOREACH(_opt_name debug static unicode universal)
-        STRING(TOUPPER ${_opt_name} _upper_opt_name)
-        IF(DEFINED wxWidgets_USE_${_upper_opt_name})
-          IF(wxWidgets_USE_${_upper_opt_name})
-            LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
-          ELSE(wxWidgets_USE_${_upper_opt_name})
-            LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
-          ENDIF(wxWidgets_USE_${_upper_opt_name})
-        ENDIF(DEFINED wxWidgets_USE_${_upper_opt_name})
-      ENDFOREACH(_opt_name)
-    ENDMACRO(WX_CONFIG_SELECT_SET_OPTIONS)
+    macro(WX_CONFIG_SELECT_SET_OPTIONS)
+      set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS})
+      foreach(_opt_name debug static unicode universal)
+        string(TOUPPER ${_opt_name} _upper_opt_name)
+        if(DEFINED wxWidgets_USE_${_upper_opt_name})
+          if(wxWidgets_USE_${_upper_opt_name})
+            list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
+          else(wxWidgets_USE_${_upper_opt_name})
+            list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
+          endif(wxWidgets_USE_${_upper_opt_name})
+        endif(DEFINED wxWidgets_USE_${_upper_opt_name})
+      endforeach(_opt_name)
+    endmacro(WX_CONFIG_SELECT_SET_OPTIONS)
 
     #-----------------------------------------------------------------
     # UNIX: Start actual work.
     #-----------------------------------------------------------------
     # Support cross-compiling, only search in the target platform.
-    FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config
+    find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
       ONLY_CMAKE_FIND_ROOT_PATH
       )
 
-    IF(wxWidgets_CONFIG_EXECUTABLE)
-      SET(wxWidgets_FOUND TRUE)
+    if(wxWidgets_CONFIG_EXECUTABLE)
+      set(wxWidgets_FOUND TRUE)
 
       # get defaults based on "wx-config --selected-config"
       WX_CONFIG_SELECT_GET_DEFAULT()
@@ -723,99 +723,99 @@ ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
       DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
 
       # run the wx-config program to get cxxflags
-      EXECUTE_PROCESS(
+      execute_process(
         COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
           ${wxWidgets_SELECT_OPTIONS} --cxxflags
         OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
         RESULT_VARIABLE RET
         ERROR_QUIET
         )
-      IF(RET EQUAL 0)
-        STRING(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
-        SEPARATE_ARGUMENTS(wxWidgets_CXX_FLAGS)
+      if(RET EQUAL 0)
+        string(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
+        separate_arguments(wxWidgets_CXX_FLAGS)
 
         DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
 
         # parse definitions from cxxflags;
         #   drop -D* from CXXFLAGS and the -D prefix
-        STRING(REGEX MATCHALL "-D[^;]+"
+        string(REGEX MATCHALL "-D[^;]+"
           wxWidgets_DEFINITIONS  "${wxWidgets_CXX_FLAGS}")
-        STRING(REGEX REPLACE "-D[^;]+(;|$)" ""
+        string(REGEX REPLACE "-D[^;]+(;|$)" ""
           wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-        STRING(REGEX REPLACE ";$" ""
+        string(REGEX REPLACE ";$" ""
           wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-        STRING(REPLACE "-D" ""
+        string(REPLACE "-D" ""
           wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
 
         # parse include dirs from cxxflags; drop -I prefix
-        STRING(REGEX MATCHALL "-I[^;]+"
+        string(REGEX MATCHALL "-I[^;]+"
           wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}")
-        STRING(REGEX REPLACE "-I[^;]+;" ""
+        string(REGEX REPLACE "-I[^;]+;" ""
           wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
-        STRING(REPLACE "-I" ""
+        string(REPLACE "-I" ""
           wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
 
         DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
         DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
         DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
 
-      ELSE(RET EQUAL 0)
-        SET(wxWidgets_FOUND FALSE)
+      else(RET EQUAL 0)
+        set(wxWidgets_FOUND FALSE)
         DBG_MSG_V(
           "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
-      ENDIF(RET EQUAL 0)
+      endif(RET EQUAL 0)
 
       # run the wx-config program to get the libs
       # - NOTE: wx-config doesn't verify that the libs requested exist
       #         it just produces the names. Maybe a TRY_COMPILE would
       #         be useful here...
-      STRING(REPLACE ";" ","
+      string(REPLACE ";" ","
         wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}")
-      EXECUTE_PROCESS(
+      execute_process(
         COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
           ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS}
         OUTPUT_VARIABLE wxWidgets_LIBRARIES
         RESULT_VARIABLE RET
         ERROR_QUIET
         )
-      IF(RET EQUAL 0)
-        STRING(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
-        SEPARATE_ARGUMENTS(wxWidgets_LIBRARIES)
-        STRING(REPLACE "-framework;" "-framework "
+      if(RET EQUAL 0)
+        string(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
+        separate_arguments(wxWidgets_LIBRARIES)
+        string(REPLACE "-framework;" "-framework "
           wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-        STRING(REPLACE "-arch;" "-arch "
+        string(REPLACE "-arch;" "-arch "
           wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
-        STRING(REPLACE "-isysroot;" "-isysroot "
+        string(REPLACE "-isysroot;" "-isysroot "
           wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
 
         # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
-        STRING(REGEX MATCHALL "-L[^;]+"
+        string(REGEX MATCHALL "-L[^;]+"
           wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}")
-        STRING(REPLACE "-L" ""
+        string(REPLACE "-L" ""
           wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
 
         DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
         DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
 
-      ELSE(RET EQUAL 0)
-        SET(wxWidgets_FOUND FALSE)
+      else(RET EQUAL 0)
+        set(wxWidgets_FOUND FALSE)
         DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}")
-      ENDIF(RET EQUAL 0)
-    ENDIF(wxWidgets_CONFIG_EXECUTABLE)
+      endif(RET EQUAL 0)
+    endif(wxWidgets_CONFIG_EXECUTABLE)
 
 #=====================================================================
 # Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
 #=====================================================================
-  ELSE(wxWidgets_FIND_STYLE STREQUAL "unix")
-    IF(NOT wxWidgets_FIND_QUIETLY)
-      MESSAGE(STATUS
+  else(wxWidgets_FIND_STYLE STREQUAL "unix")
+    if(NOT wxWidgets_FIND_QUIETLY)
+      message(STATUS
         "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
         "  Platform unknown/unsupported. It's neither WIN32 nor UNIX "
         "find style."
         )
-    ENDIF(NOT wxWidgets_FIND_QUIETLY)
-  ENDIF(wxWidgets_FIND_STYLE STREQUAL "unix")
-ENDIF(wxWidgets_FIND_STYLE STREQUAL "win32")
+    endif(NOT wxWidgets_FIND_QUIETLY)
+  endif(wxWidgets_FIND_STYLE STREQUAL "unix")
+endif(wxWidgets_FIND_STYLE STREQUAL "win32")
 
 # Debug output:
 DBG_MSG("wxWidgets_FOUND           : ${wxWidgets_FOUND}")
@@ -827,10 +827,10 @@ DBG_MSG("wxWidgets_USE_FILE        : ${wxWidgets_USE_FILE}")
 
 #=====================================================================
 #=====================================================================
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND)
 # Maintain consistency with all other variables.
-SET(wxWidgets_FOUND ${WXWIDGETS_FOUND})
+set(wxWidgets_FOUND ${WXWIDGETS_FOUND})
 
 #=====================================================================
 # Macros for use in wxWidgets apps.
@@ -841,7 +841,7 @@ SET(wxWidgets_FOUND ${WXWIDGETS_FOUND})
 #=====================================================================
 
 # Resource file compiler.
-FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc
+find_program(wxWidgets_wxrc_EXECUTABLE wxrc
   ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
   )
 
@@ -852,10 +852,10 @@ FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc
 # respectively, of <keyword>.
 #
 # Example usage:
-#  FUNCTION(WXWIDGETS_ADD_RESOURCES outfiles)
+#  function(WXWIDGETS_ADD_RESOURCES outfiles)
 #    WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN})
 #    ...
-#  ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
+#  endfunction(WXWIDGETS_ADD_RESOURCES)
 #
 #  WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C)
 #
@@ -866,29 +866,29 @@ FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc
 # here a bit more generalized. So, there are already two find modules
 # using this approach.
 #
-FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
+function(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
   # FIXME: Document that the input variables will be cleared.
-  #LIST(APPEND ${_leftvar}  "")
-  #LIST(APPEND ${_rightvar} "")
-  SET(${_leftvar}  "")
-  SET(${_rightvar} "")
-
-  SET(_doing_right FALSE)
-  FOREACH(element ${ARGN})
-    IF("${element}" STREQUAL "${_keyword}")
-      SET(_doing_right TRUE)
-    ELSE("${element}" STREQUAL "${_keyword}")
-      IF(_doing_right)
-        LIST(APPEND ${_rightvar} "${element}")
-      ELSE(_doing_right)
-        LIST(APPEND ${_leftvar} "${element}")
-      ENDIF(_doing_right)
-    ENDIF("${element}" STREQUAL "${_keyword}")
-  ENDFOREACH(element)
-
-  SET(${_leftvar}  ${${_leftvar}}  PARENT_SCOPE)
-  SET(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
-ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
+  #list(APPEND ${_leftvar}  "")
+  #list(APPEND ${_rightvar} "")
+  set(${_leftvar}  "")
+  set(${_rightvar} "")
+
+  set(_doing_right FALSE)
+  foreach(element ${ARGN})
+    if("${element}" STREQUAL "${_keyword}")
+      set(_doing_right TRUE)
+    else("${element}" STREQUAL "${_keyword}")
+      if(_doing_right)
+        list(APPEND ${_rightvar} "${element}")
+      else(_doing_right)
+        list(APPEND ${_leftvar} "${element}")
+      endif(_doing_right)
+    endif("${element}" STREQUAL "${_keyword}")
+  endforeach(element)
+
+  set(${_leftvar}  ${${_leftvar}}  PARENT_SCOPE)
+  set(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
+endfunction(WX_SPLIT_ARGUMENTS_ON)
 
 #
 # WX_GET_DEPENDENCIES_FROM_XML(
@@ -901,7 +901,7 @@ ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON)
 #
 # FIXME: Add documentation here...
 #
-FUNCTION(WX_GET_DEPENDENCIES_FROM_XML
+function(WX_GET_DEPENDENCIES_FROM_XML
     _depends
     _match_patt
     _clean_patt
@@ -909,25 +909,25 @@ FUNCTION(WX_GET_DEPENDENCIES_FROM_XML
     _depends_path
     )
 
-  STRING(REGEX MATCHALL
+  string(REGEX MATCHALL
     ${_match_patt}
     dep_file_list
     "${${_xml_contents}}"
     )
-  FOREACH(dep_file ${dep_file_list})
-    STRING(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
+  foreach(dep_file ${dep_file_list})
+    string(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
 
     # make the file have an absolute path
-    IF(NOT IS_ABSOLUTE "${dep_file}")
-      SET(dep_file "${${_depends_path}}/${dep_file}")
-    ENDIF(NOT IS_ABSOLUTE "${dep_file}")
+    if(NOT IS_ABSOLUTE "${dep_file}")
+      set(dep_file "${${_depends_path}}/${dep_file}")
+    endif(NOT IS_ABSOLUTE "${dep_file}")
 
     # append file to dependency list
-    LIST(APPEND ${_depends} "${dep_file}")
-  ENDFOREACH(dep_file)
+    list(APPEND ${_depends} "${dep_file}")
+  endforeach(dep_file)
 
-  SET(${_depends} ${${_depends}} PARENT_SCOPE)
-ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML)
+  set(${_depends} ${${_depends}} PARENT_SCOPE)
+endfunction(WX_GET_DEPENDENCIES_FROM_XML)
 
 #
 # WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files>
@@ -940,21 +940,21 @@ ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML)
 #   WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc)
 #   WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx)
 #
-FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles)
+function(WXWIDGETS_ADD_RESOURCES _outfiles)
   WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN})
 
   # Parse files for dependencies.
-  SET(rc_file_list_abs "")
-  SET(rc_depends       "")
-  FOREACH(rc_file ${rc_file_list})
-    GET_FILENAME_COMPONENT(depends_path ${rc_file} PATH)
+  set(rc_file_list_abs "")
+  set(rc_depends       "")
+  foreach(rc_file ${rc_file_list})
+    get_filename_component(depends_path ${rc_file} PATH)
 
-    GET_FILENAME_COMPONENT(rc_file_abs ${rc_file} ABSOLUTE)
-    LIST(APPEND rc_file_list_abs "${rc_file_abs}")
+    get_filename_component(rc_file_abs ${rc_file} ABSOLUTE)
+    list(APPEND rc_file_list_abs "${rc_file_abs}")
 
     # All files have absolute paths or paths relative to the location
     # of the rc file.
-    FILE(READ "${rc_file_abs}" rc_file_contents)
+    file(READ "${rc_file_abs}" rc_file_contents)
 
     # get bitmap/bitmap2 files
     WX_GET_DEPENDENCIES_FROM_XML(
@@ -982,63 +982,63 @@ FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles)
       rc_file_contents
       depends_path
       )
-  ENDFOREACH(rc_file)
+  endforeach(rc_file)
 
   #
   # Parse options.
   #
   # If NO_CPP_CODE option specified, then produce .xrs file rather
   # than a .cpp file (i.e., don't add the default --cpp-code option).
-  LIST(FIND rc_options NO_CPP_CODE index)
-  IF(index EQUAL -1)
-    LIST(APPEND rc_options --cpp-code)
+  list(FIND rc_options NO_CPP_CODE index)
+  if(index EQUAL -1)
+    list(APPEND rc_options --cpp-code)
     # wxrc's default output filename for cpp code.
-    SET(outfile resource.cpp)
-  ELSE(index EQUAL -1)
-    LIST(REMOVE_AT rc_options ${index})
+    set(outfile resource.cpp)
+  else(index EQUAL -1)
+    list(REMOVE_AT rc_options ${index})
     # wxrc's default output filename for xrs file.
-    SET(outfile resource.xrs)
-  ENDIF(index EQUAL -1)
+    set(outfile resource.xrs)
+  endif(index EQUAL -1)
 
   # Get output name for use in ADD_CUSTOM_COMMAND.
   # - short option scanning
-  LIST(FIND rc_options -o index)
-  IF(NOT index EQUAL -1)
-    MATH(EXPR filename_index "${index} + 1")
-    LIST(GET rc_options ${filename_index} outfile)
-    #LIST(REMOVE_AT rc_options ${index} ${filename_index})
-  ENDIF(NOT index EQUAL -1)
+  list(FIND rc_options -o index)
+  if(NOT index EQUAL -1)
+    math(EXPR filename_index "${index} + 1")
+    list(GET rc_options ${filename_index} outfile)
+    #list(REMOVE_AT rc_options ${index} ${filename_index})
+  endif(NOT index EQUAL -1)
   # - long option scanning
-  STRING(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
-  IF(outfile_opt)
-    STRING(REPLACE "--output=" "" outfile "${outfile_opt}")
-  ENDIF(outfile_opt)
-  #STRING(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
-  #STRING(REGEX REPLACE ";$" "" rc_options "${rc_options}")
-
-  IF(NOT IS_ABSOLUTE "${outfile}")
-    SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
-  ENDIF(NOT IS_ABSOLUTE "${outfile}")
-  ADD_CUSTOM_COMMAND(
+  string(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
+  if(outfile_opt)
+    string(REPLACE "--output=" "" outfile "${outfile_opt}")
+  endif(outfile_opt)
+  #string(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
+  #string(REGEX REPLACE ";$" "" rc_options "${rc_options}")
+
+  if(NOT IS_ABSOLUTE "${outfile}")
+    set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+  endif(NOT IS_ABSOLUTE "${outfile}")
+  add_custom_command(
     OUTPUT "${outfile}"
     COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs}
     DEPENDS ${rc_file_list_abs} ${rc_depends}
     )
 
   # Add generated header to output file list.
-  LIST(FIND rc_options -e short_index)
-  LIST(FIND rc_options --extra-cpp-code long_index)
-  IF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
-    GET_FILENAME_COMPONENT(outfile_ext ${outfile} EXT)
-    STRING(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
-    LIST(APPEND ${_outfiles} "${outfile_header}")
-    SET_SOURCE_FILES_PROPERTIES(
+  list(FIND rc_options -e short_index)
+  list(FIND rc_options --extra-cpp-code long_index)
+  if(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+    get_filename_component(outfile_ext ${outfile} EXT)
+    string(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
+    list(APPEND ${_outfiles} "${outfile_header}")
+    set_source_files_properties(
       "${outfile_header}" PROPERTIES GENERATED TRUE
       )
-  ENDIF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+  endif(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
 
   # Add generated file to output file list.
-  LIST(APPEND ${_outfiles} "${outfile}")
+  list(APPEND ${_outfiles} "${outfile}")
 
-  SET(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
-ENDFUNCTION(WXWIDGETS_ADD_RESOURCES)
+  set(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
+endfunction(WXWIDGETS_ADD_RESOURCES)