Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

minor

Browse source
This commit is contained in:
Annika Wierichs 2017-10-10 14:37:21 +02:00
parent e72f9a32b9
commit 303d60c437
5 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/hermit/CMakeLists.txt
View file

@ -14,4 +14,5 @@ install(FILES
DESTINATION ${TARGET_ARCH}/include/hermit/
COMPONENT bootstrap)
# More of a workaround?
file(COPY ibv.h DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/hermit")

8
usr/ircce/CMakeLists.txt
View file

@ -12,7 +12,7 @@ add_library(ircce STATIC ${SOURCES})
# deployment
install(TARGETS ircce
DESTINATION ${TARGET_ARCH}/lib)
install(FILES
iRCCE.h iRCCE_lib.h RCCE_debug.h RCCE.h RCCE_lib.h rte_memcpy.h
DESTINATION
${TARGET_ARCH}/include)
install(FILES
iRCCE.h iRCCE_lib.h RCCE_debug.h RCCE.h RCCE_lib.h rte_memcpy.h
DESTINATION
${TARGET_ARCH}/include)

18
usr/rdma-core/libibverbs/CMakeLists.txt
View file

@ -24,6 +24,7 @@ endif()
configure_file("libibverbs.map.in"
"${CMAKE_CURRENT_BINARY_DIR}/libibverbs.map" @ONLY)
# runs add_library.
rdma_library(ibverbs "${CMAKE_CURRENT_BINARY_DIR}/libibverbs.map"
# See Documentation/versioning.md
1 1.1.${PACKAGE_VERSION}
@ -38,6 +39,7 @@ rdma_library(ibverbs "${CMAKE_CURRENT_BINARY_DIR}/libibverbs.map"
sysfs.c
verbs.c
)
target_link_libraries(ibverbs LINK_PRIVATE
${NL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
@ -47,14 +49,18 @@ target_link_libraries(ibverbs LINK_PRIVATE
message(STATUS "LOCAL_PREFIX_ARCH_LIB_DIR : ${LOCAL_PREFIX_ARCH_LIB_DIR}")
message(STATUS "LOCAL_PREFIX_ARCH_INCLUDE_DIR : ${LOCAL_PREFIX_ARCH_INCLUDE_DIR}")
file(COPY verbs.h DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}")
# Why does it work for ircce?
# This actually shouldn't work. Why does it work for ircce???
# TODO: We probably also need this for the install step?
#install(TARGETS ibverbs
#DESTINATION "${LOCAL_PREFIX_ARCH_LIB_DIR}/")
#DESTINATION ${LOCAL_PREFIX_ARCH_LIB_DIR})
#install(FILES verbs.h
#DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/")
#DESTINATION ${LOCAL_PREFIX_ARCH_INCLUDE_DIR})
#rdma_create_symlink("${CMAKE_CURRENT_SOURCE_DIR}/verbs.h"
#"${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/verbs.h") # working
# Runs "execute_process(COMMAND ... ln ..."
rdma_create_symlink("${CMAKE_CURRENT_SOURCE_DIR}/verbs.h"
"${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/verbs.h") # working
# Alternative to symlink: Simply copies verbs hdr to build include dir.
#file(COPY verbs.h DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}")

2
usr/tests/CMakeLists.txt
View file

@ -10,7 +10,7 @@ add_executable(hellof hellof.f90)
add_executable(pi pi.go)
add_executable(ib-test ib_test.c)
#target_link_libraries(ib-test ibverbs)
target_link_libraries(ib-test ibverbs)
add_executable(test-malloc test-malloc.c)
add_executable(test-malloc-mt test-malloc-mt.c)

2
usr/tests/ib_test.c
View file

@ -32,7 +32,7 @@
#include <errno.h>
#include <signal.h>
/*#include <verbs.h> // GEHT, brauche ich aber nicht?*/
#include <verbs.h> // GEHT, brauche ich aber nicht?
#include <hermit/ibv.h> // Geht per cmake copy workaround