          arg STREQUAL "MODULE"
          )
        list(APPEND ${_cmake_options} ${arg})
-@@ -1449,9 +1450,11 @@
+@@ -1376,6 +1377,11 @@
+       list(APPEND nvcc_flags -ccbin "\"${CUDA_HOST_COMPILER}\"")
+     endif()
+     set(flags)
++    set(important_host_flags)
++    _cuda_get_important_host_flags(important_host_flags ${CMAKE_${CUDA_C_OR_CXX}_FLAGS})
++    foreach(f ${important_host_flags})
++      list(APPEND flags -Xcompiler ${f})
++    endforeach()
+     foreach(config ${CUDA_configuration_types})
+       string(TOUPPER ${config} config_upper)
+       set(important_host_flags)
+@@ -1449,9 +1455,11 @@
    # variable will have been defined.
    CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS("${link_file}" ${cuda_target} "${_options}" "${${cuda_target}_SEPARABLE_COMPILATION_OBJECTS}")
  

   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	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 ":")

   # 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-06-04 16:17:37.610059121 -0600
@@ -56,7 +56,10 @@
   PATH_SUFFIXES include/freetype2 include
 )
