Look for uuid/uuid.h instead of just uuid.h

Avoids a conflict between /usr/include/uuid.h and
/usr/local/include/uuid/uuid.h on freebsd
This commit is contained in:
louiz’
2016-09-29 20:11:35 +02:00
parent 20a06c953f
commit 363a0bf02c
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ include(FindPkgConfig)
pkg_check_modules(LIBUUID uuid) pkg_check_modules(LIBUUID uuid)
if(NOT LIBUUID_FOUND) if(NOT LIBUUID_FOUND)
find_path(LIBUUID_INCLUDE_DIRS NAMES uuid.h find_path(LIBUUID_INCLUDE_DIRS NAMES uuid/uuid.h
PATH_SUFFIXES uuid PATH_SUFFIXES uuid
DOC "The libuuid include directory") DOC "The libuuid include directory")
+1 -1
View File
@@ -14,7 +14,7 @@
#include <set> #include <set>
#include <stdio.h> #include <stdio.h>
#include <uuid.h> #include <uuid/uuid.h>
#include <cstdlib> #include <cstdlib>
#include <set> #include <set>
+1 -1
View File
@@ -4,7 +4,7 @@
#include <database/database.hpp> #include <database/database.hpp>
#include <logger/logger.hpp> #include <logger/logger.hpp>
#include <irc/iid.hpp> #include <irc/iid.hpp>
#include <uuid.h> #include <uuid/uuid.h>
#include <utils/get_first_non_empty.hpp> #include <utils/get_first_non_empty.hpp>
#include <utils/time.hpp> #include <utils/time.hpp>
+1 -1
View File
@@ -20,7 +20,7 @@
#include <louloulibs.h> #include <louloulibs.h>
#include <biboumi.h> #include <biboumi.h>
#include <uuid.h> #include <uuid/uuid.h>
#ifdef SYSTEMD_FOUND #ifdef SYSTEMD_FOUND
# include <systemd/sd-daemon.h> # include <systemd/sd-daemon.h>