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, 30 insertions, 30 deletions

diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index 8205779..55790ae 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -20,69 +20,69 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-IF (WIN32)
-  FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h 
+if (WIN32)
+  find_path( GLUT_INCLUDE_DIR NAMES GL/glut.h
     PATHS  ${GLUT_ROOT_PATH}/include )
-  FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
+  find_library( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
     PATHS
     ${OPENGL_LIBRARY_DIR}
     ${GLUT_ROOT_PATH}/Release
     )
-ELSE (WIN32)
-  
-  IF (APPLE)
+else ()
+
+  if (APPLE)
     # These values for Apple could probably do with improvement.
-    FIND_PATH( GLUT_INCLUDE_DIR glut.h
+    find_path( GLUT_INCLUDE_DIR glut.h
       /System/Library/Frameworks/GLUT.framework/Versions/A/Headers
       ${OPENGL_LIBRARY_DIR}
       )
-    SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX") 
-    SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
-  ELSE (APPLE)
-    
-    FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
+    set(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX")
+    set(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
+  else ()
+
+    find_path( GLUT_INCLUDE_DIR GL/glut.h
       /usr/include/GL
       /usr/openwin/share/include
       /usr/openwin/include
       /opt/graphics/OpenGL/include
       /opt/graphics/OpenGL/contrib/libglut
       )
-  
-    FIND_LIBRARY( GLUT_glut_LIBRARY glut
+
+    find_library( GLUT_glut_LIBRARY glut
       /usr/openwin/lib
       )
-    
-    FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
+
+    find_library( GLUT_Xi_LIBRARY Xi
       /usr/openwin/lib
       )
-    
-    FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
+
+    find_library( GLUT_Xmu_LIBRARY Xmu
       /usr/openwin/lib
       )
-    
-  ENDIF (APPLE)
-  
-ENDIF (WIN32)
 
-INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+  endif ()
+
+endif ()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR)
 
-IF (GLUT_FOUND)
+if (GLUT_FOUND)
   # Is -lXi and -lXmu required on all platforms that have it?
   # If not, we need some way to figure out what platform we are on.
-  SET( GLUT_LIBRARIES
+  set( GLUT_LIBRARIES
     ${GLUT_glut_LIBRARY}
     ${GLUT_Xmu_LIBRARY}
     ${GLUT_Xi_LIBRARY}
     ${GLUT_cocoa_LIBRARY}
     )
-    
+
   #The following deprecated settings are for backwards compatibility with CMake1.4
-  SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
-  SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
-ENDIF(GLUT_FOUND)
+  set (GLUT_LIBRARY ${GLUT_LIBRARIES})
+  set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
+endif()
 
-MARK_AS_ADVANCED(
+mark_as_advanced(
   GLUT_INCLUDE_DIR
   GLUT_glut_LIBRARY
   GLUT_Xmu_LIBRARY