modified cmakelists to use proper vars