Updated various CMakeLists.txt to improve the build process.