Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

-DCMAKE_INSTALL_RPATH=/app/lib/aarch64-linux-gnu

Browse source 
Signed-off-by: Alexandra <alexandra.bach@eonerc.rwth-aachen.de>
This commit is contained in:
Alexandra 2024-05-02 12:27:03 +00:00
parent 3db350e84a
commit bcb8665748
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/CMakeLists.txt
View file

@ -128,7 +128,6 @@ if(WITH_FPGA)
list(APPEND LIBRARIES villas-fpga)
endif()
link_directories(/app/lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu)
add_library(villas SHARED ${LIB_SRC})
target_include_directories(villas PUBLIC ${INCLUDE_DIRS})
target_link_libraries(villas PUBLIC ${LIBRARIES})

6
packaging/docker/Dockerfile.debian-multiarch
View file

@ -20,8 +20,6 @@ ARG PREFIX
ENV DEBIAN_FRONTEND=noninteractive
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/app/lib/aarch64-linux-gnu
# Enable ${ARCH} architecture
RUN dpkg --add-architecture ${ARCH}
@ -119,7 +117,9 @@ COPY . /villas/
RUN rm -rf /villas/build && mkdir /villas/build
WORKDIR /villas/build
RUN cmake ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. && \
RUN echo "Debug: build started"
RUN cmake -DCMAKE_INSTALL_RPATH=/app/lib/aarch64-linux-gnu ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. && \
make -j$(nproc) install
RUN echo "Debug: build finished"