Finally fixes CMake dependency errors for real.