explicit env variables

Author: andiwand

conanfile.py

@@ -77,13 +77,13 @@ def generate(self):
         # Get runenv info, exported by package_info() of dependencies
         # We need to obtain PDF2HTMLEX_DATA_DIR, POPPLER_DATA_DIR, FONTCONFIG_PATH and WVDATADIR
         runenv_info = Environment()
-        deps = self.dependencies.host.topological_sort
-        deps = [dep for dep in reversed(deps.values())]
-        for dep in deps:
+        for dep in self.dependencies.host.topological_sort.values():
             runenv_info.compose_env(dep.runenv_info)
         envvars = runenv_info.vars(self)
-        for v in ["PDF2HTMLEX_DATA_DIR", "POPPLER_DATA_DIR", "FONTCONFIG_PATH", "WVDATADIR", "MAGIC"]:
-            tc.variables[v] = envvars.get(v)
+        tc.variables["FONTCONFIG_DATA_PATH"] = envvars.get("FONTCONFIG_PATH")
+        tc.variables["POPPLER_DATA_PATH"] = envvars.get("POPPLER_DATA_DIR")
+        tc.variables["PDF2HTMLEX_DATA_PATH"] = envvars.get("PDF2HTMLEX_DATA_DIR")
+        tc.variables["LIBMAGIC_DATABASE_PATH"] = envvars.get("MAGIC")
 
         tc.generate()
 

src/odr/internal/project_info.cpp.in

@@ -41,19 +41,19 @@ const char *project_info::odr_data_path() noexcept {
 }
 
 const char *project_info::fontconfig_data_path() noexcept {
-  return "${FONTCONFIG_PATH}";
+  return "${FONTCONFIG_DATA_PATH}";
 }
 
 const char *project_info::poppler_data_path() noexcept {
-        return "${POPPLER_DATA_DIR}";
+        return "${POPPLER_DATA_PATH}";
 }
 
 const char *project_info::pdf2htmlex_data_path() noexcept{
-        return "${PDF2HTMLEX_DATA_DIR}";
+        return "${PDF2HTMLEX_DATA_PATH}";
 }
 
 const char *project_info::libmagic_database_path() noexcept{
-        return "${MAGIC}";
+        return "${LIBMAGIC_DATABASE_PATH}";
 }
 
 } // namespace odr::internal