Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modifications to support non-Linux OSes (tested on FreeBSD 14) #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+51 −0
Open

Modifications to support non-Linux OSes (tested on FreeBSD 14) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ pkg_check_modules(MICROHTTPD REQUIRED libmicrohttpd)
pkg_check_modules(SODIUM REQUIRED libsodium)
find_package(Threads REQUIRED)

if(NOT LINUX)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a good way to do build conditionals. Need to check if epoll/argp work without extra libs, and check for extra libs if needed.

Noteworthy, some Linux distros do not have argp.

pkg_check_modules(EPOLL_SHIM REQUIRED epoll-shim)
find_library(LIBARGP argp)

if(NOT LIBARGP)
message(FATAL_ERROR "argp library not found")
endif()
endif()

set(POW_LIBS "")
include(CheckLibraryExists)
check_library_exists(m pow "" LIBM)
Expand All @@ -64,6 +73,7 @@ add_custom_command(
VERBATIM
)

if(LINUX)
target_include_directories(datum_gateway
PRIVATE
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
Expand Down Expand Up @@ -95,3 +105,43 @@ target_compile_options(datum_gateway
${JANSSON_CFLAGS} ${JANSSON_CFLAGS_OTHER}
${SODIUM_CFLAGS} ${SODIUM_CFLAGS_OTHER}
)

else()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't duplicate the whole thing. Just set the new vars to empty if not needed.

target_include_directories(datum_gateway
PRIVATE
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
${CURL_INCLUDE_DIRS}
${MICROHTTPD_INCLUDE_DIRS}
${JANSSON_INCLUDE_DIRS}
${SODIUM_INCLUDE_DIRS}
${EPOLL_SHIM_INCLUDE_DIRS}
)
target_link_directories(datum_gateway
PUBLIC
${CURL_LIBRARY_DIRS}
${MICROHTTPD_LIBRARY_DIRS}
${JANSSON_LIBRARY_DIRS}
${SODIUM_LIBRARY_DIRS}
${EPOLL_SHIM_LIBRARY_DIRS}
)
target_link_libraries(datum_gateway
PUBLIC
${POW_LIBS}
Threads::Threads
${CURL_LIBRARIES} ${CURL_LDFLAGS} ${CURL_LDFLAGS_OTHER}
${MICROHTTPD_LIBRARIES} ${MICROHTTPD_LDFLAGS} ${MICROHTTPD_LDFLAGS_OTHER}
${JANSSON_LIBRARIES} ${JANSSON_LDFLAGS} ${JANSSON_LDFLAGS_OTHER}
${SODIUM_LIBRARIES} ${SODIUM_LDFLAGS} ${SODIUM_LDFLAGS_OTHER}
${EPOLL_SHIM_LIBRARIES} ${EPOLL_SHIM_LDFLAGS} ${EPOLL_SHIM_LDFLAGS_OTHER}
${LIBARGP}
)
target_compile_options(datum_gateway
PUBLIC
${CURL_CFLAGS} ${CURL_CFLAGS_OTHER}
${MICROHTTPD_CFLAGS} ${MICROHTTPD_CFLAGS_OTHER}
${JANSSON_CFLAGS} ${JANSSON_CFLAGS_OTHER}
${SODIUM_CFLAGS} ${SODIUM_CFLAGS_OTHER}
${EPOLL_SHIM_CFLAGS} ${EPOLL_SHIM_CFLAGS_OTHER}
)

endif()
1 change: 1 addition & 0 deletions src/datum_protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
#include <sys/time.h>
#include <pthread.h>
#include <netinet/tcp.h>
#include <netinet/in.h>
#include <inttypes.h>

#include "datum_utils.h"
Expand Down