Updated CMake stuff; added some macros