Updated to use CMake's improved target commands.
linker fix
Unix fix
Revert "Unix fix"

This reverts commit d23a7fda6fd291606784c1fb4f24af6c65eae517.
Merge remote-tracking branch 'origin/next' into drive_split