CMake file changes
CMake file fixes.