From 498510b42ee174d8d55703f27b53547a6ac2c44b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 17 Jul 2014 17:30:06 -0700
Subject: [PATCH] cleanup GLM find module

---
 cmake/modules/FindGLM.cmake | 79 +++++++++----------------------------
 1 file changed, 18 insertions(+), 61 deletions(-)

diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
index 1bd1239193..f6247617b1 100644
--- a/cmake/modules/FindGLM.cmake
+++ b/cmake/modules/FindGLM.cmake
@@ -1,67 +1,24 @@
-# FindGLM - attempts to locate the glm matrix/vector library.
 #
-# This module defines the following variables (on success):
-#   GLM_INCLUDE_DIRS  - where to find glm/glm.hpp
-#   GLM_FOUND         - if the library was successfully located
-#
-# It is trying a few standard installation locations, but can be customized
-# with the following variables:
-#   GLM_ROOT_DIR      - root directory of a glm installation
-#                       Headers are expected to be found in either:
-#                       <GLM_ROOT_DIR>/glm/glm.hpp           OR
-#                       <GLM_ROOT_DIR>/include/glm/glm.hpp
-#                       This variable can either be a cmake or environment
-#                       variable. Note however that changing the value
-#                       of the environment varible will NOT result in
-#                       re-running the header search and therefore NOT
-#                       adjust the variables set by this module.
-
-# This is a modified version of the FindGLM module included with CMake.
-# Copyright 2014 High Fidelity
+#  FindGLM.cmake
 # 
-#=============================================================================
-# Copyright 2012 Carsten Neumann
+#  Try to find GLM include path.
+#  Once done this will define
 #
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
+#  GLM_INCLUDE_DIRS
+# 
+#  Created on 7/17/2014 by Stephen Birarda
+#  Copyright 2014 High Fidelity, Inc.
+# 
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
 
-if (GLM_INCLUDE_DIR)
-  set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
-  set(GLM_FOUND TRUE)
-else ()
-  # default search dirs
-  set(_glm_HEADER_SEARCH_DIRS "$ENV{HIFI_LIB_DIR}/glm" "/usr/include" "/usr/local/include")
+# setup hints for GLM search
+set(GLM_HEADER_SEARCH_HINTS "${GLM_ROOT_DIR}" "$ENV{GLM_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/glm")
 
-  # check environment variable
-  set(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}")
+# locate header
+find_path(GLM_INCLUDE_DIR "glm/glm.hpp" HINTS ${GLM_HEADER_SEARCH_HINTS})
+set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
 
-  if (NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR)
-      set(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}")
-  endif ()
-
-  # put user specified location at beginning of search
-  if (GLM_ROOT_DIR)
-      set(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" "${GLM_ROOT_DIR}/include" "$ENV{HIFI_LIB_DIR}/glm" ${_glm_HEADER_SEARCH_DIRS})
-  ENDIF()
-
-  # locate header
-  find_path(GLM_INCLUDE_DIR "glm/glm.hpp" PATHS ${_glm_HEADER_SEARCH_DIRS})
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIR)
-
-  if (GLM_FOUND)
-      set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
-    
-      if (NOT GLM_FIND_QUIETLY)
-        MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}")
-      endif (NOT GLM_FIND_QUIETLY)
-  endif ()
-endif () 
\ No newline at end of file
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIRS)
\ No newline at end of file