diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-10-20 23:10:09 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-10-20 23:10:09 +0200 |
| commit | 11bca5a7af4b448ee0a37cd243e34ecd0e652b3d (patch) | |
| tree | 04a51ccec3f2db4d16591698c76c4c56b893ec1b /cmake | |
| parent | 64d0bef9efd4a82b7a132b490328c80e67431041 (diff) | |
| download | fastd-11bca5a7af4b448ee0a37cd243e34ecd0e652b3d.tar fastd-11bca5a7af4b448ee0a37cd243e34ecd0e652b3d.zip | |
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.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config.cmake | 2 | ||||
| -rw-r--r-- | cmake/generate_version.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
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}" |