diff -up openjpeg-1.5.1/CMakeLists.txt.fast-math openjpeg-1.5.1/CMakeLists.txt
--- openjpeg-1.5.1/CMakeLists.txt.fast-math	2015-04-28 15:04:28.265928682 -0600
+++ openjpeg-1.5.1/CMakeLists.txt	2015-04-28 15:04:28.268928664 -0600
@@ -192,7 +192,7 @@ IF(CMAKE_COMPILER_IS_GNUCC)
   # For all builds, make sure openjpeg is std99 compliant:
   # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
   # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
-  SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
+  SET(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 #-----------------------------------------------------------------------------
diff -up openjpeg-1.5.1/libopenjpeg/CMakeLists.txt.fast-math openjpeg-1.5.1/libopenjpeg/CMakeLists.txt
--- openjpeg-1.5.1/libopenjpeg/CMakeLists.txt.fast-math	2012-09-13 01:58:39.000000000 -0600
+++ openjpeg-1.5.1/libopenjpeg/CMakeLists.txt	2015-04-28 15:04:54.773770250 -0600
@@ -39,6 +39,7 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
 ENDIF(UNIX)
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+TARGET_COMPILE_OPTIONS(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
 
 # Build the JPWL library ?
 IF(BUILD_JPWL)
diff -up openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt.fast-math openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt
--- openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt.fast-math	2012-09-13 01:58:39.000000000 -0600
+++ openjpeg-1.5.1/libopenjpeg/jpwl/CMakeLists.txt	2015-04-28 15:04:59.053744670 -0600
@@ -28,6 +28,7 @@ IF(UNIX)
 ENDIF(UNIX)
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL 
   PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+TARGET_COMPILE_OPTIONS(${OPENJPEG_LIBRARY_NAME}_JPWL PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
 
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL