Migrated Makefile to CMake
CMake build improvements