Removed dependence to cmake_support