more cmake styling and module cleanup

cmake/macros/IncludeGLM.cmake

@@ -3,8 +3,8 @@ macro(INCLUDE_GLM TARGET ROOT_DIR)
 	find_package(GLM REQUIRED)
 	include_directories("${GLM_INCLUDE_DIRS}")
 
-  if(APPLE OR UNIX)
+  if (APPLE OR UNIX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${GLM_INCLUDE_DIRS}")
-  endif(APPLE OR UNIX)
+  endif ()
 
 endmacro(INCLUDE_GLM _target _root_dir)

cmake/macros/SetupHifiProject.cmake

@@ -7,10 +7,10 @@ macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
   file(GLOB SRC_SUBDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*)
   
   foreach(DIR ${SRC_SUBDIRS})
-    if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}")
+    if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/${DIR}")
       file(GLOB DIR_CONTENTS "src/${DIR}/*")
       set(TARGET_SRCS ${TARGET_SRCS} "${DIR_CONTENTS}")
-    endif()
+    endif ()
   endforeach()
   
   # add the executable, include additional optional sources

cmake/modules/FindFaceshift.cmake

@@ -15,7 +15,7 @@
 if (FACESHIFT_LIBRARIES AND FACESHIFT_INCLUDE_DIRS)
   # in cache already
   set(FACESHIFT_FOUND TRUE)
-else (FACESHIFT_LIBRARIES AND FACESHIFT_INCLUDE_DIRS)
+else ()
   find_path(FACESHIFT_INCLUDE_DIRS fsbinarystream.h ${FACESHIFT_ROOT_DIR}/include)
 
   if (APPLE)
@@ -35,24 +35,24 @@ else (FACESHIFT_LIBRARIES AND FACESHIFT_INCLUDE_DIRS)
     if (FACESHIFT_INCLUDE_DIRS)
       set(FACESHIFT_FOUND TRUE)
     endif (FACESHIFT_INCLUDE_DIRS AND FACESHIFT_LIBRARIES)
-  else (WIN32)
+  else ()
     # Mac and Unix requires libraries
     if (FACESHIFT_INCLUDE_DIRS AND FACESHIFT_LIBRARIES)
       set(FACESHIFT_FOUND TRUE)
     endif (FACESHIFT_INCLUDE_DIRS AND FACESHIFT_LIBRARIES)
-  endif (WIN32)
+  endif ()
 
   if (FACESHIFT_FOUND)
     if (NOT FACESHIFT_FIND_QUIETLY)
       message(STATUS "Found Faceshift... ${FACESHIFT_LIBRARIES}")
     endif (NOT FACESHIFT_FIND_QUIETLY)
-  else (FACESHIFT_FOUND)
+  else ()
     if (FACESHIFT_FIND_REQUIRED)
       message(FATAL_ERROR "Could not find Faceshift")
     endif (FACESHIFT_FIND_REQUIRED)
-  endif (FACESHIFT_FOUND)
+  endif ()
 
   # show the FACESHIFT_INCLUDE_DIRS and FACESHIFT_LIBRARIES variables only in the advanced view
   mark_as_advanced(FACESHIFT_INCLUDE_DIRS FACESHIFT_LIBRARIES)
 
-endif (FACESHIFT_LIBRARIES AND FACESHIFT_INCLUDE_DIRS)
+endif ()

cmake/modules/FindGLEW.cmake

@@ -12,40 +12,46 @@
 # Adapted from FindGLEW.cmake available in the nvidia-texture-tools repository
 # (https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/cmake/FindGLEW.cmake?r=96)
 
-IF (WIN32)    
-	FIND_PATH(GLEW_INCLUDE_DIRS GL/glew.h
-    "${GLEW_ROOT_DIR}/include"
-    "$ENV{GLEW_ROOT_DIR}/include"
-	  "$ENV{HIFI_LIB_DIR}/glew/include"
-	  DOC "The directory where GL/glew.h resides")
-  if (CMAKE_CL_64)
-    set(WIN_ARCH_DIR "x64")
-  else()
-    set(LINUX_ARCH_DIR "Win32")
-  endif()
-	
-	FIND_LIBRARY(GLEW_LIBRARY
-		NAMES glew GLEW glew32 glew32s
-		PATHS
-    "${GLEW_ROOT_DIR}/lib/Release/${WIN_ARCH_DIR}"
-    "$ENV{GLEW_ROOT_DIR}/lib/Release/${WIN_ARCH_DIR}"
-		"$ENV{HIFI_LIB_DIR}/glew/lib/Release/${WIN_ARCH_DIR}"
-		DOC "The GLEW library")
-ENDIF()
-
 if (GLEW_INCLUDE_DIRS AND GLEW_LIBRARY)
-   set(GLEW_FOUND TRUE)
+  set(GLEW_FOUND TRUE)
-endif ()
-
-if (GLEW_FOUND)
-  if (NOT GLEW_FIND_QUIETLY)
-    message(STATUS "Found GLEW: ${GLEW_LIBRARY}")
-  endif (NOT GLEW_FIND_QUIETLY)
 else ()
-  if (GLEW_FIND_REQUIRED)
+  if (WIN32)    
-    message(FATAL_ERROR "Could not find GLEW")
+  	find_path(GLEW_INCLUDE_DIRS GL/glew.h
-  endif (GLEW_FIND_REQUIRED)
+      "${GLEW_ROOT_DIR}/include"
-endif ()
+      "$ENV{GLEW_ROOT_DIR}/include"
+  	  "$ENV{HIFI_LIB_DIR}/glew/include"
+  	  DOC "The directory where GL/glew.h resides"
+    )
+  
+    if (CMAKE_CL_64)
+      set(WIN_ARCH_DIR "x64")
+    else()
+      set(LINUX_ARCH_DIR "Win32")
+    endif()
+	
+  	find_library(GLEW_LIBRARY
+  		NAMES glew GLEW glew32 glew32s
+  		PATHS
+      "${GLEW_ROOT_DIR}/lib/Release/${WIN_ARCH_DIR}"
+      "$ENV{GLEW_ROOT_DIR}/lib/Release/${WIN_ARCH_DIR}"
+  		"$ENV{HIFI_LIB_DIR}/glew/lib/Release/${WIN_ARCH_DIR}"
+  		DOC "The GLEW library"
+    )
+  endif ()
 
-# show the GLEW_INCLUDE_DIRS and GLEW_LIBRARY variables only in the advanced view
+  include(FindPackageHandleStandardArgs)
-mark_as_advanced(GLEW_INCLUDE_DIRS GLEW_LIBRARY)
+  find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARY)
+  
+  if (GLEW_FOUND)
+    if (NOT GLEW_FIND_QUIETLY)
+      message(STATUS "Found GLEW: ${GLEW_LIBRARY}")
+    endif ()
+  else ()
+    if (GLEW_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find GLEW")
+    endif ()
+  endif ()
+  
+  # show the GLEW_INCLUDE_DIRS and GLEW_LIBRARY variables only in the advanced view
+  mark_as_advanced(GLEW_INCLUDE_DIRS GLEW_LIBRARY)
+endif ()

cmake/modules/FindGLM.cmake

@@ -16,6 +16,9 @@
 #                       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
+# 
 #=============================================================================
 # Copyright 2012 Carsten Neumann
 #
@@ -29,44 +32,36 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-IF (GLM_INCLUDE_DIR)
+if (GLM_INCLUDE_DIR)
   set(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
-  SET(GLM_FOUND TRUE)
+  set(GLM_FOUND TRUE)
-ELSE (GLM_INCLUDE_DIR)
+else ()
   # default search dirs
-  SET(_glm_HEADER_SEARCH_DIRS
+  set(_glm_HEADER_SEARCH_DIRS "$ENV{HIFI_LIB_DIR}/glm" "/usr/include" "/usr/local/include")
-      "$ENV{HIFI_LIB_DIR}/glm"
-      "/usr/include"
-      "/usr/local/include")
 
   # check environment variable
-  SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}")
+  set(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}")
 
-  IF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR)
+  if (NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR)
-      SET(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}")
+      set(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}")
-  ENDIF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR)
+  endif ()
 
   # put user specified location at beginning of search
-  IF(GLM_ROOT_DIR)
+  if (GLM_ROOT_DIR)
-      SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}"
+      set(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" "${GLM_ROOT_DIR}/include" "$ENV{HIFI_LIB_DIR}/glm" ${_glm_HEADER_SEARCH_DIRS})
-                                  "${GLM_ROOT_DIR}/include"
+  ENDIF()
-                                  "$ENV{HIFI_LIB_DIR}/glm"
-                                   ${_glm_HEADER_SEARCH_DIRS})
-  ENDIF(GLM_ROOT_DIR)
 
   # locate header
-  FIND_PATH(GLM_INCLUDE_DIR "glm/glm.hpp"
+  find_path(GLM_INCLUDE_DIR "glm/glm.hpp" PATHS ${_glm_HEADER_SEARCH_DIRS})
-      PATHS ${_glm_HEADER_SEARCH_DIRS})
 
-  INCLUDE(FindPackageHandleStandardArgs)
+  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG
+  find_package_handle_standard_args(GLM DEFAULT_MSG GLM_INCLUDE_DIR)
-      GLM_INCLUDE_DIR)
 
-  IF(GLM_FOUND)
+  if (GLM_FOUND)
-      SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}")
+      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(GLM_FOUND)
+  endif ()
-ENDIF(GLM_INCLUDE_DIR) 
+endif ()