From 11bca5a7af4b448ee0a37cd243e34ecd0e652b3d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 20 Oct 2015 23:10:09 +0200
Subject: Improve include_directories to prevent conflicts between system and
 fastd headers

In in-tree builds, fastd's poll.h was conflicting with the system one on
non-Linux systems.
---
 cmake/config.cmake           | 2 +-
 cmake/generate_version.cmake | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'cmake')

diff --git a/cmake/config.cmake b/cmake/config.cmake
index 049304f..9ddf5bf 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -12,7 +12,7 @@ endif()
 
 
 set(USE_BINDTODEVICE ${LINUX})
-set(USE_EPOLL ${LINUX})
+set(USE_EPOLL FALSE)
 set(USE_FREEBIND ${LINUX})
 set(USE_PMTU ${LINUX})
 set(USE_PKTINFO ${LINUX})
diff --git a/cmake/generate_version.cmake b/cmake/generate_version.cmake
index 3830800..104e49c 100644
--- a/cmake/generate_version.cmake
+++ b/cmake/generate_version.cmake
@@ -1,7 +1,8 @@
-set(VERSION_FILE "${FASTD_BINARY_DIR}/src/fastd_version.h")
+set(VERSION_FILE "${FASTD_BINARY_DIR}/gen/generated/version.h")
 
 add_custom_target(
     version
+    COMMAND mkdir -p "${FASTD_BINARY_DIR}/gen/generated"
     COMMAND echo "#pragma once" > "${VERSION_FILE}.new"
     COMMAND sh -c "echo \"#define FASTD_VERSION \\\"$(git --git-dir=./.git describe --dirty 2>/dev/null || echo ${FASTD_VERSION})\\\"\"" >> "${VERSION_FILE}.new"
     COMMAND cmp -s "${VERSION_FILE}" "${VERSION_FILE}.new" && rm "${VERSION_FILE}.new" || mv "${VERSION_FILE}.new" "${VERSION_FILE}"
-- 
cgit v1.2.3