[cmake] fixes for 2.3 core module changes