Merge #47: gen.cpp: Check local includes before install includes

1007bd7 gen.cpp: Check local includes before install includes (Russell Yanofsky)

Pull request description:

  Fix `make check` if previous incompatible version of libmultiprocess is installed and `make install` hasn't been run yet to update it.

  Carl Dong reported this issue in #44 and confirmed the fix in #44 (comment)

Top commit has no ACKs.

Tree-SHA512: 11e8089ea83b37a5a45fb34af25e8f419a0660f77736b506870dd41d449c169962c046568b0f5e019567d6cb66effbab2d367d59a1490c41366dd571cc9c1796

Author: ryanofsky

src/mp/gen.cpp

@@ -598,16 +598,16 @@ int main(int argc, char** argv)
     auto fs = kj::newDiskFilesystem();
     auto cwd = fs->getCurrentPath();
 #endif
+    for (size_t i = 4; i < argc; ++i) {
+        import_paths.push_back(argv[i]);
+    }
     for (const char* path : {CMAKE_INSTALL_PREFIX "/include", capnp_PREFIX "/include"}) {
 #ifdef HAVE_KJ_FILESYSTEM
         KJ_IF_MAYBE(dir, fs->getRoot().tryOpenSubdir(cwd.evalNative(path))) { import_paths.emplace_back(path); }
 #else
         import_paths.emplace_back(path);
 #endif
     }
-    for (size_t i = 4; i < argc; ++i) {
-        import_paths.push_back(argv[i]);
-    }
     Generate(argv[1], argv[2], argv[3], {import_paths.data(), import_paths.size()});
     return 0;
 }