One last small change for CMakeLists and CMAKE_CXX_FLAGS. (#260)
Merge pull request #274 from rjeczalik/master-integration

One last small change for CMakeLists and CMAKE_CXX_FLAGS. (#260)