2 files changed, 32 insertions, 3 deletions

diff --git a/cmake/GetSNAP.cmake b/cmake/GetSNAP.cmake
index ff0c968..d3e55e2 100644
--- a/cmake/GetSNAP.cmake
+++ b/cmake/GetSNAP.cmake
@@ -14,6 +14,21 @@ elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(SNAP_ARCH_FLAG -DGLib_64Bit)
 endif()
 
+include(CheckIncludeFileCXX)
+check_include_file_cxx("poll.h" SNAP_HAVE_POLL_H)
+if(SNAP_HAVE_POLL_H)
+        set(SNAP_POLL_FLAG -DSNAP_HAVE_POLL_H)
+else()
+        check_include_file_cxx("sys/poll.h" SNAP_HAVE_SYS_POLL_H)
+        if (SNAP_HAVE_SYS_POLL_H)
+                set(SNAP_POLL_FLAG -DSNAP_HAVE_SYS_POLL_H)
+        else()
+                message(FATAL "Required header <poll.h> or <sys/poll.h> not found")
+        endif()
+endif()
+
+set(SNAP_CXX_FLAGS "${SNAP_ARCH_FLAG} ${SNAP_POLL_FLAG} ${OpenMP_CXX_FLAGS}")
+
 include(ExternalProject)
 ExternalProject_Add(
         SNAP
@@ -24,7 +39,7 @@ ExternalProject_Add(
         PATCH_COMMAND ${SNAP_PATCHCMD}
         CONFIGURE_COMMAND ""
         BUILD_IN_SOURCE TRUE
-        BUILD_COMMAND make CXXFLAGS=${SNAP_ARCH_FLAG}
+        BUILD_COMMAND make "CXXFLAGS=${SNAP_CXX_FLAGS}"
         COMMAND make -C snap-core lib
         BUILD_BYPRODUCTS snap-core/libsnap.a
         INSTALL_COMMAND ""
@@ -48,4 +63,5 @@ target_include_directories(SNAP::SNAP
         "${SNAP_SOURCE_DIR}/glib-core"
 )
 
+target_compile_definitions(SNAP::SNAP INTERFACE ${SNAP_ARCH_FLAG})
 target_link_libraries(SNAP::SNAP INTERFACE OpenMP::OpenMP_CXX)
diff --git a/cmake/snap-glib-base.patch b/cmake/snap-glib-base.patch
index 42fcb41..669f797 100644
--- a/cmake/snap-glib-base.patch
+++ b/cmake/snap-glib-base.patch
@@ -1,6 +1,19 @@
 --- a/glib-core/base.h
 +++ b/glib-core/base.h
-@@ -89,7 +89,7 @@
+@@ -66,7 +66,11 @@
+   #include <dirent.h>

+   #include <unistd.h>

+   #include <signal.h>

+-  #include <sys/poll.h>

++  #if defined(SNAP_HAVE_POLL_H)

++         #include <poll.h>

++  #elif defined(SNAP_HAVE_SYS_POLL_H)

++    #include <sys/poll.h>

++  #endif

+   #include <sys/socket.h>

+   #include <sys/stat.h>

+   #include <sys/time.h>

+@@ -89,7 +93,7 @@
    #define GLib_32Bit

  #elif __WORDSIZE == 64 || defined(GLib_WIN64) || defined(__CYGWIN64__)

    #define GLib_64Bit

@@ -9,7 +22,7 @@
    #error "Undefined word size"

  #endif

  

-@@ -98,10 +98,8 @@
+@@ -98,10 +102,8 @@
      #if defined(GLib_MACOSX)

       #include <crt_externs.h>

       #define _environ (*_NSGetEnviron())