Skip to content

Commit

Permalink
Fix the include error for scope_guard.hpp (#1563)
Browse files Browse the repository at this point in the history
* Update CMakeLists.txt to add scope guard directory in include.

* Update Compiler.cpp  to correct path of scope guard header

* Update CompilerOpenFPGA.cpp

* Incremented patch version

---------

Co-authored-by: NadeemYaseen <NadeemYaseen@users.noreply.github.com>
  • Loading branch information
NadeemYaseen and NadeemYaseen committed May 2, 2024
1 parent 353a987 commit 8c4a70d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ endif(NOT CMAKE_BUILD_TYPE)
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
# Add the spdlog directory to the include path
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk ${CMAKE_CURRENT_SOURCE_DIR}/third_party/scope_guard)


set(VERSION_PATCH 359)
set(VERSION_PATCH 360)

option(
WITH_LIBCXX
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "Utils/ProcessUtils.h"
#include "Utils/QtUtils.h"
#include "Utils/StringUtils.h"
#include "scope_guard/scope_guard.hpp"
#include "scope_guard.hpp"

extern FOEDAG::Session* GlobalSession;
using namespace FOEDAG;
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/CompilerOpenFPGA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "Utils/QtUtils.h"
#include "Utils/StringUtils.h"
#include "nlohmann_json/json.hpp"
#include "scope_guard/scope_guard.hpp"
#include "scope_guard.hpp"

using json = nlohmann::ordered_json;
namespace fs = std::filesystem;
Expand Down

0 comments on commit 8c4a70d

Please sign in to comment.