Corrected an issue on Windows
Corrected a CMake error on Linux.