Improved boost compatibility

Now should work with newer CMake (v3.0+)