summaryrefslogtreecommitdiff
path: root/louloulibs
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-09-29 20:11:35 +0200
committerlouiz’ <louiz@louiz.org>2016-09-29 20:11:35 +0200
commit363a0bf02cf20592b2f9f034de1c5f54c8922b82 (patch)
treee4a424f245840139f88e291c53b24aadb4f74d83 /louloulibs
parent20a06c953f8f29229af44de13fb29215dccc9d60 (diff)
downloadbiboumi-363a0bf02cf20592b2f9f034de1c5f54c8922b82.tar.gz
biboumi-363a0bf02cf20592b2f9f034de1c5f54c8922b82.tar.bz2
biboumi-363a0bf02cf20592b2f9f034de1c5f54c8922b82.tar.xz
biboumi-363a0bf02cf20592b2f9f034de1c5f54c8922b82.zip
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
Diffstat (limited to 'louloulibs')
-rw-r--r--louloulibs/cmake/Modules/FindLIBUUID.cmake2
-rw-r--r--louloulibs/xmpp/xmpp_component.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/louloulibs/cmake/Modules/FindLIBUUID.cmake b/louloulibs/cmake/Modules/FindLIBUUID.cmake
index 17d3c42..f344249 100644
--- a/louloulibs/cmake/Modules/FindLIBUUID.cmake
+++ b/louloulibs/cmake/Modules/FindLIBUUID.cmake
@@ -19,7 +19,7 @@ include(FindPkgConfig)
pkg_check_modules(LIBUUID uuid)
if(NOT LIBUUID_FOUND)
- find_path(LIBUUID_INCLUDE_DIRS NAMES uuid.h
+ find_path(LIBUUID_INCLUDE_DIRS NAMES uuid/uuid.h
PATH_SUFFIXES uuid
DOC "The libuuid include directory")
diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp
index f437a15..b10479a 100644
--- a/louloulibs/xmpp/xmpp_component.cpp
+++ b/louloulibs/xmpp/xmpp_component.cpp
@@ -14,7 +14,7 @@
#include <set>
#include <stdio.h>
-#include <uuid.h>
+#include <uuid/uuid.h>
#include <cstdlib>
#include <set>