adding install path in preprocessor search directories

sylefeb · Aug 26, 2024 · 0f265b4 · 0f265b4
1 parent a1ca8fb
commit 0f265b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -164,7 +164,7 @@ else()
   install(PROGRAMS  bin/report-cycles.py  DESTINATION bin/)
   install(FILES     projects/ice-v/CPUs/ice-v.si      DESTINATION share/silice/projects/ice-v/CPUs/)
   install(FILES     projects/ice-v/CPUs/ice-v-dual.si DESTINATION share/silice/projects/ice-v/CPUs/)
-  install(FILES     projects/common/divint_std.si     DESTINATION share/silice/projects/common/)
+  install(DIRECTORY projects/common       DESTINATION share/silice/projects/ USE_SOURCE_PERMISSIONS)
   install(DIRECTORY frameworks            DESTINATION share/silice/ USE_SOURCE_PERMISSIONS)
   install(DIRECTORY src/libs/LibSL-small  DESTINATION share/silice/src/libs/)
 

diff --git a/src/LuaPreProcessor.cpp b/src/LuaPreProcessor.cpp
@@ -1445,6 +1445,8 @@ void LuaPreProcessor::generateBody(
   // add current directory to search dirs
   m_SearchPaths.push_back(getCurrentPath());
   m_SearchPaths.push_back(extractPath(fileAbsolutePath(src_file)));
+  m_SearchPaths.push_back(std::string(SILICE_DEFAULT_PATH) + "/projects/common/");
+  m_SearchPaths.push_back(std::string(SILICE_DEFAULT_PATH) + "/share/silice/projects/common/");
 
   // get code
   std::unordered_set<std::string> inclusions;