Updated to use CMake's improved target commands.
Merge branch 'cmake_update' into next