From 0f265b4e995afc10824764f7c8a4392401da6a26 Mon Sep 17 00:00:00 2001 From: Sylvain Lefebvre Date: Mon, 26 Aug 2024 20:49:31 +0200 Subject: [PATCH] adding install path in preprocessor search directories --- CMakeLists.txt | 2 +- src/LuaPreProcessor.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f88570ed..48887f81 100644 --- 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 index ed48ad2d..7b4cb515 100644 --- 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 inclusions;