[PTFM-5906] Updated CMakeLists.txt and Makefiles