  
    # We need to set the linker language based on what the expected generated file
    # would be. CUDA_C_OR_CXX is computed based on CUDA_HOST_COMPILATION_CPP.
+diff -ruN cmake-2.8.12.1/Modules/FindFreetype.cmake cmake-2.8.12.1-new/Modules/FindFreetype.cmake
+--- cmake-2.8.12.1/Modules/FindFreetype.cmake	2013-11-05 12:07:22.000000000 -0700
++++ cmake-2.8.12.1-new/Modules/FindFreetype.cmake	2015-03-03 08:34:31.129691518 -0700
+@@ -56,7 +56,10 @@
+   PATH_SUFFIXES include/freetype2 include
+ )
+ 
+-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++find_path(FREETYPE_INCLUDE_DIR_freetype2
++  NAMES
++    freetype/config/ftheader.h
++    config/ftheader.h
+   HINTS
+     ENV FREETYPE_DIR
+   PATHS
 diff -ruN cmake-2.8.12.1/Modules/Platform/Linux.cmake cmake-2.8.12.1-new/Modules/Platform/Linux.cmake
 --- cmake-2.8.12.1/Modules/Platform/Linux.cmake	2013-11-05 12:07:22.000000000 -0700
-+++ cmake-2.8.12.1-new/Modules/Platform/Linux.cmake	2014-08-28 12:36:15.686590100 -0600
++++ cmake-2.8.12.1-new/Modules/Platform/Linux.cmake	2015-03-03 08:29:27.466415708 -0700
 @@ -2,7 +2,7 @@
  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")

diff -ruN cmake-2.8.12.1/Modules/FindCUDA.cmake cmake-2.8.12.1-new/Modules/FindCUDA.cmake
--- cmake-2.8.12.1/Modules/FindCUDA.cmake	2013-11-05 12:07:22.000000000 -0700
+++ cmake-2.8.12.1-new/Modules/FindCUDA.cmake	2014-08-28 12:35:04.980520200 -0600
@@ -852,6 +852,7 @@
         arg STREQUAL "EXCLUDE_FROM_ALL" OR
         arg STREQUAL "STATIC" OR

 
   if(XIAR)
     # INTERPROCEDURAL_OPTIMIZATION
