Commit 4b840336 authored by Dmitry I. Lyakh's avatar Dmitry I. Lyakh
Browse files

Fixed the build due to runtime package compilation errors.

parent 58695078
......@@ -14,12 +14,13 @@ add_library(${LIBRARY_NAME}
target_include_directories(
${LIBRARY_NAME}
PUBLIC .
boost
${CMAKE_SOURCE_DIR}/tpls/ExaTensor/include
${CMAKE_SOURCE_DIR}/src/exatn
${CMAKE_SOURCE_DIR}/tpls/cppmicroservices/framework/include
)
target_link_libraries(${LIBRARY_NAME} PUBLIC CppMicroServices exatn-numerics exatn-runtime-graph)
target_link_libraries(${LIBRARY_NAME} PUBLIC CppMicroServices exatn-numerics exatn-runtime-graph PRIVATE Boost::graph)
if(APPLE)
set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH "@loader_path")
......@@ -33,7 +34,7 @@ if(EXATN_BUILD_TESTS)
#add_subdirectory(tests)
endif()
file (GLOB HEADERS *.hpp)
file (GLOB HEADERS *.hpp boost/*.hpp)
install(FILES ${HEADERS} DESTINATION include/exatn/runtime)
install(TARGETS ${LIBRARY_NAME} DESTINATION lib)
......@@ -9,7 +9,7 @@
#include "tensor.hpp"
#include "tensor_operation.hpp"
#include "DirectedBoostGraph.hpp"
include "tensor_method.hpp"
#include "tensor_method.hpp"
namespace exatn {
namespace runtime {
......
......@@ -12,8 +12,10 @@ add_library(${LIBRARY_NAME}
target_include_directories(
${LIBRARY_NAME}
PUBLIC . boost
PUBLIC .
boost
${CMAKE_SOURCE_DIR}/src/exatn
${CMAKE_SOURCE_DIR}/src/numerics
${CMAKE_SOURCE_DIR}/tpls/cppmicroservices/framework/include
)
......@@ -50,4 +52,3 @@ file (GLOB HEADERS *.hpp boost/*.hpp)
install(FILES ${HEADERS} DESTINATION include/exatn/runtime)
install(TARGETS ${LIBRARY_NAME} DESTINATION plugins)
......@@ -14,8 +14,7 @@ DirectedBoostGraph::DirectedBoostGraph() {
}
void DirectedBoostGraph::addEdge(const std::shared_ptr<TensorOpNode> &srcNode, const std::shared_ptr<TensorOpNode> &tgtNode) {
add_edge(vertex(srcNode.id, *_graph.get()), vertex(tgtNode.id, *_graph.get()),
*_graph.get());
add_edge(vertex(srcNode->id, *_graph.get()), vertex(tgtNode->id, *_graph.get()), *_graph.get());
}
/*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment