From c9e18e8d90b5c33d06a20ed6249f5a763ea79dfb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Aug 2016 11:59:49 -0700
Subject: [PATCH] spacing repairs in autoscribe_shader_lib

---
 cmake/macros/AutoScribeShader.cmake | 118 ++++++++++++++--------------
 libraries/gpu/CMakeLists.txt        |   2 +-
 2 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index e586304503..958b444672 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -1,77 +1,75 @@
-# 
+#
 #  AutoScribeShader.cmake
-# 
+#
 #  Created by Sam Gateau on 12/17/14.
 #  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
-# 
+#
 
 function(AUTOSCRIBE_SHADER SHADER_FILE)
-    
-    # Grab include files
-    foreach(includeFile  ${ARGN})
-        list(APPEND SHADER_INCLUDE_FILES ${includeFile})
-    endforeach()
+  # Grab include files
+  foreach(includeFile  ${ARGN})
+    list(APPEND SHADER_INCLUDE_FILES ${includeFile})
+  endforeach()
 
-    foreach(SHADER_INCLUDE ${SHADER_INCLUDE_FILES})
-        get_filename_component(INCLUDE_DIR ${SHADER_INCLUDE} PATH)
-        list(APPEND SHADER_INCLUDES_PATHS ${INCLUDE_DIR})
-    endforeach()
+  foreach(SHADER_INCLUDE ${SHADER_INCLUDE_FILES})
+    get_filename_component(INCLUDE_DIR ${SHADER_INCLUDE} PATH)
+    list(APPEND SHADER_INCLUDES_PATHS ${INCLUDE_DIR})
+  endforeach()
 
+  #Extract the unique include shader paths
+  set(INCLUDES ${HIFI_LIBRARIES_SHADER_INCLUDE_FILES})
+  #message(${TARGET_NAME} Hifi for includes ${INCLUDES})
+  foreach(EXTRA_SHADER_INCLUDE ${INCLUDES})
+    list(APPEND SHADER_INCLUDES_PATHS ${EXTRA_SHADER_INCLUDE})
+  endforeach()
 
-    #Extract the unique include shader paths
-    set(INCLUDES ${HIFI_LIBRARIES_SHADER_INCLUDE_FILES})
-    #message(${TARGET_NAME} Hifi for includes ${INCLUDES})
-    foreach(EXTRA_SHADER_INCLUDE ${INCLUDES})
-      list(APPEND SHADER_INCLUDES_PATHS ${EXTRA_SHADER_INCLUDE})
-    endforeach()
+  list(REMOVE_DUPLICATES SHADER_INCLUDES_PATHS)
+  #message(ready for includes ${SHADER_INCLUDES_PATHS})
 
-    list(REMOVE_DUPLICATES SHADER_INCLUDES_PATHS)
-    #message(ready for includes ${SHADER_INCLUDES_PATHS})
+  # make the scribe include arguments
+  set(SCRIBE_INCLUDES)
+  foreach(INCLUDE_PATH ${SHADER_INCLUDES_PATHS})
+    set(SCRIBE_INCLUDES ${SCRIBE_INCLUDES} -I ${INCLUDE_PATH}/)
+  endforeach()
 
-    # make the scribe include arguments
-    set(SCRIBE_INCLUDES)
-    foreach(INCLUDE_PATH ${SHADER_INCLUDES_PATHS})
-        set(SCRIBE_INCLUDES ${SCRIBE_INCLUDES} -I ${INCLUDE_PATH}/)
-    endforeach()
+  # Define the final name of the generated shader file
+  get_filename_component(SHADER_TARGET ${SHADER_FILE} NAME_WE)
+  get_filename_component(SHADER_EXT ${SHADER_FILE} EXT)
+  if(SHADER_EXT STREQUAL .slv)
+    set(SHADER_TARGET ${SHADER_TARGET}_vert.h)
+  elseif(${SHADER_EXT} STREQUAL .slf)
+    set(SHADER_TARGET ${SHADER_TARGET}_frag.h)
+  elseif(${SHADER_EXT} STREQUAL .slg)
+    set(SHADER_TARGET ${SHADER_TARGET}_geom.h)
+  endif()
 
-    # Define the final name of the generated shader file
-    get_filename_component(SHADER_TARGET ${SHADER_FILE} NAME_WE)
-    get_filename_component(SHADER_EXT ${SHADER_FILE} EXT)
-    if(SHADER_EXT STREQUAL .slv)
-        set(SHADER_TARGET ${SHADER_TARGET}_vert.h)
-    elseif(${SHADER_EXT} STREQUAL .slf) 
-        set(SHADER_TARGET ${SHADER_TARGET}_frag.h)
-    elseif(${SHADER_EXT} STREQUAL .slg) 
-        set(SHADER_TARGET ${SHADER_TARGET}_geom.h)
-    endif()
+  set(SHADER_TARGET "${SHADERS_DIR}/${SHADER_TARGET}")
 
-    set(SHADER_TARGET "${SHADERS_DIR}/${SHADER_TARGET}")
+  # Target dependant Custom rule on the SHADER_FILE
+  if (APPLE)
+    set(GLPROFILE MAC_GL)
+    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-    # Target dependant Custom rule on the SHADER_FILE
-    if (APPLE)
-        set(GLPROFILE MAC_GL)
-        set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+  elseif (UNIX)
+    set(GLPROFILE LINUX_GL)
+    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-        add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
-    elseif (UNIX)
-        set(GLPROFILE LINUX_GL)
-        set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+  else ()
+    set(GLPROFILE PC_GL)
+    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-        add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
-    else ()
-        set(GLPROFILE PC_GL)
-        set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+  endif()
 
-        add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
-    endif()
+  #output the generated file name
+  set(AUTOSCRIBE_SHADER_RETURN ${SHADER_TARGET} PARENT_SCOPE)
 
-    #output the generated file name
-    set(AUTOSCRIBE_SHADER_RETURN ${SHADER_TARGET} PARENT_SCOPE)
-
-    file(GLOB INCLUDE_FILES ${SHADER_TARGET})
+  file(GLOB INCLUDE_FILES ${SHADER_TARGET})
 
 endfunction()
 
@@ -79,11 +77,11 @@ endfunction()
 macro(AUTOSCRIBE_SHADER_LIB)
   set(HIFI_LIBRARIES_SHADER_INCLUDE_FILES "")
   file(RELATIVE_PATH RELATIVE_LIBRARY_DIR_PATH ${CMAKE_CURRENT_SOURCE_DIR} "${HIFI_LIBRARY_DIR}")
-  foreach(HIFI_LIBRARY ${ARGN})    
+  foreach(HIFI_LIBRARY ${ARGN})
     #if (NOT TARGET ${HIFI_LIBRARY})
     #  file(GLOB_RECURSE HIFI_LIBRARIES_SHADER_INCLUDE_FILES ${RELATIVE_LIBRARY_DIR_PATH}/${HIFI_LIBRARY}/src/)
     #endif ()
-  
+
     #file(GLOB_RECURSE HIFI_LIBRARIES_SHADER_INCLUDE_FILES ${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src/*.slh)
     list(APPEND HIFI_LIBRARIES_SHADER_INCLUDE_FILES ${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src)
   endforeach()
@@ -99,9 +97,9 @@ macro(AUTOSCRIBE_SHADER_LIB)
   #message("${TARGET_NAME} ${SHADER_INCLUDE_FILES}")
   set(AUTOSCRIBE_SHADER_SRC "")
   foreach(SHADER_FILE ${SHADER_SOURCE_FILES})
-      AUTOSCRIBE_SHADER(${SHADER_FILE} ${SHADER_INCLUDE_FILES})
-      file(TO_CMAKE_PATH "${AUTOSCRIBE_SHADER_RETURN}" AUTOSCRIBE_GENERATED_FILE)
-      list(APPEND AUTOSCRIBE_SHADER_SRC ${AUTOSCRIBE_GENERATED_FILE})
+    AUTOSCRIBE_SHADER(${SHADER_FILE} ${SHADER_INCLUDE_FILES})
+    file(TO_CMAKE_PATH "${AUTOSCRIBE_SHADER_RETURN}" AUTOSCRIBE_GENERATED_FILE)
+    list(APPEND AUTOSCRIBE_SHADER_SRC ${AUTOSCRIBE_GENERATED_FILE})
   endforeach()
   #message(${TARGET_NAME} ${AUTOSCRIBE_SHADER_SRC})
 
@@ -118,4 +116,4 @@ macro(AUTOSCRIBE_SHADER_LIB)
   # Link library shaders, if they exist
   include_directories("${SHADERS_DIR}")
 
-endmacro()
\ No newline at end of file
+endmacro()
diff --git a/libraries/gpu/CMakeLists.txt b/libraries/gpu/CMakeLists.txt
index ecddeb07ad..384c5709ee 100644
--- a/libraries/gpu/CMakeLists.txt
+++ b/libraries/gpu/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(TARGET_NAME gpu)
-AUTOSCRIBE_SHADER_LIB(gpu)
+autoscribe_shader_lib(gpu)
 setup_hifi_library()
 link_hifi_libraries(shared)