Fixing typo that caused a CMake warning.

Change-Id: Id7740021d8d0a4a622b06a8a9721ba7d3ff2ad31
Fixed build issues and proper placement of code.

Change-Id: I3b78788c90313859c586e9e30c93499dceb6e4ed
Merge topic '13048_spatio-temporal-parallelism' into next

5754eeb Fixed build issues and proper placement of code.
465a545 Fixing typo that caused a CMake warning.