TEMPORARY: CMakeLists fix to try and get dependencies right.