If CMake supports per-target include directories make use of them,
otherwise default to directoy scope include directories (as has been
used before). Also made a few minor improvements to CMake wrapping code.

Change-Id: I86790eb9999b56ce8cf8c24e82793123159d8f23