upm: update past modules to use new CMake macro