Minor cmake cleanup

indra/cmake/GStreamer010Plugin.cmake

@@ -17,7 +17,7 @@ else (STANDALONE)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   set(GSTREAMER010_INCLUDE_DIRS
     ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10
-    ${LIBS_PREBUILT_DIR}/includeg/lib-2.0
+    ${LIBS_PREBUILT_DIR}/include/glib-2.0
     ${LIBS_PREBUILT_DIR}/include/libxml2
     ${LIBS_PREBUILT_LEGACY_DIR}/include/gstreamer-0.10
     ${LIBS_PREBUILT_LEGACY_DIR}/include/glib-2.0

indra/cmake/Hunspell.cmake

@@ -11,5 +11,5 @@ else (STANDALONE)
   else (LINUX OR DARWIN)
     set(HUNSPELL_LIBRARY libhunspell)
   endif (LINUX OR DARWIN)
-  set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell )
+  set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
 endif (STANDALONE)

indra/cmake/PNG.cmake

@@ -32,15 +32,5 @@ else (STANDALONE)
       set(PNG_LIBRARIES png16)
     endif ()
   endif()
-  if (WINDOWS)
-    set(PNG_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/${PNG_LIBRARIES}
-      ${LIBS_PREBUILT_LEGACY_DIR}/include/${PNG_LIBRARIES}
-      )
-  else (WINDOWS)
-    set(PNG_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/lib${PNG_LIBRARIES}
-      ${LIBS_PREBUILT_LEGACY_DIR}/include/lib${PNG_LIBRARIES}
-      )
-  endif (WINDOWS)
+    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
 endif (STANDALONE)

indra/cmake/PulseAudio.cmake

@@ -13,9 +13,8 @@ if (PULSEAUDIO)
     use_prebuilt_binary(pulseaudio)
     set(PULSEAUDIO_FOUND ON FORCE BOOL)
     set(PULSEAUDIO_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include
-      ${LIBS_PREBUILT_LEGACY_DIR}/include
-      )
+        ${LIBS_PREBUILT_DIR}/include
+        )
     # We don't need to explicitly link against pulseaudio itself, because
     # the viewer probes for the system's copy at runtime.
     set(PULSEAUDIO_LIBRARIES

indra/cmake/UI.cmake

@@ -63,10 +63,7 @@ else (STANDALONE)
       ${LIBS_PREBUILT_LEGACY_DIR}/include/pixman-1
       )
   foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(
-        ${LIBS_PREBUILT_DIR}/include/${include}
-        ${LIBS_PREBUILT_LEGACY_DIR}/include/${include}
-        )
+      include_directories(${LIBS_PREBUILT_DIR}/include/${include})
   endforeach(include)
 endif (STANDALONE)
 

indra/cmake/ZLIB.cmake

@@ -17,9 +17,6 @@ else (STANDALONE)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
   if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/zlib
-      ${LIBS_PREBUILT_LEGACY_DIR}/include/zlib
-      )
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
   endif (WINDOWS OR LINUX)
 endif (STANDALONE)