[Cmake] Append to variables instead of overwriting. Include dirs to top level
Modify STRD data file reading