Index: MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt
===================================================================
--- MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt
+++ MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 
-list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11)
+list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
+list(APPEND CXX_FLAGS -std=c++11)
 
 llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/anisotropicDiffusionOutput.txt")
 llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/anisotropicDiffusionOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/anisotropicDiffusion.reference_output")
Index: MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt
===================================================================
--- MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt
+++ MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 
-list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11)
+list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
+list(APPEND CXX_FLAGS -std=c++11)
 
 llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/boxBlurOutput.txt")
 llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/boxBlurOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/boxBlur.reference_output")
Index: MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt
===================================================================
--- MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt
+++ MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
-list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11)
+list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
+list(APPEND CXX_FLAGS -std=c++11)
 
 llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/orderedOutput.txt")
 llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/orderedOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/orderedDither.reference_output")
Index: MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt
===================================================================
--- MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt
+++ MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
-list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11)
+list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
+list(APPEND CXX_FLAGS -std=c++11)
 
 llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/bicubicOutput.txt")
 llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/bicubicOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/bicubic.reference_output")