 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
++++ cmake-2.8.12.1-new/Modules/FindCUDA.cmake	2015-03-03 08:26:44.567022884 -0700
 @@ -852,6 +852,7 @@
          arg STREQUAL "EXCLUDE_FROM_ALL" OR
          arg STREQUAL "STATIC" OR

 
   if(XIAR)
     # INTERPROCEDURAL_OPTIMIZATION
diff -ruN cmake-2.8.12.1/Modules/Platform/Linux-Intel-C.cmake cmake-2.8.12.1-new/Modules/Platform/Linux-Intel-C.cmake
--- cmake-2.8.12.1/Modules/Platform/Linux-Intel-C.cmake	2013-11-05 12:07:22.000000000 -0700
+++ cmake-2.8.12.1-new/Modules/Platform/Linux-Intel-C.cmake	2014-08-28 12:35:04.989521100 -0600
@@ -1,2 +1,4 @@
 include(Platform/Linux-Intel)
+# Fix for Intel 13.1.0.20130607 on hopper.nersc.gov
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname=")
 __linux_compiler_intel(C)
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  2014-09-23 11:23:35.263693600 -0600
+++ cmake-2.8.12.1-new/Modules/FindFreetype.cmake       2014-09-23 11:23:54.414693600 -0600
@@ -70,6 +70,22 @@
   PATH_SUFFIXES include/freetype2 include
 )

+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
+  find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype2/config/ftheader.h
+    HINTS
+      ENV FREETYPE_DIR
+    PATHS
+      /usr/X11R6
+      /usr/local/X11R6
+      /usr/local/X11
+      /usr/freeware
+      ENV GTKMM_BASEPATH
+      [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+    PATH_SUFFIXES include/freetype2 include
+  )
+endif()
+
 find_library(FREETYPE_LIBRARY
   NAMES freetype libfreetype freetype219
   HINTS

 set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
 
 # Shared libraries with no builtin soname may not be linked safely by
diff -ruN cmake-2.8.12.1/Modules/Platform/Linux-Intel-C.cmake cmake-2.8.12.1-new/Modules/Platform/Linux-Intel-C.cmake
--- cmake-2.8.12.1/Modules/Platform/Linux-Intel-C.cmake	2013-11-05 12:07:22.000000000 -0700
+++ cmake-2.8.12.1-new/Modules/Platform/Linux-Intel-C.cmake	2015-03-03 08:29:59.502706309 -0700
@@ -1,2 +1,4 @@
 include(Platform/Linux-Intel)
+# Fix for Intel 13.1.0.20130607 on hopper.nersc.gov
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname=")
 __linux_compiler_intel(C)
diff -ruN cmake-2.8.12.1/Modules/Platform/Linux-Intel.cmake cmake-2.8.12.1-new/Modules/Platform/Linux-Intel.cmake
--- cmake-2.8.12.1/Modules/Platform/Linux-Intel.cmake	2013-11-05 12:07:22.000000000 -0700
+++ cmake-2.8.12.1-new/Modules/Platform/Linux-Intel.cmake	2015-03-03 08:30:25.303134998 -0700
@@ -38,7 +38,8 @@
 
   # We pass this for historical reasons.  Projects may have
