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
4 files changed, 4 insertions(+), 4 deletions(-) M louloulibs/cmake/Modules/FindLIBUUID.cmake M louloulibs/xmpp/xmpp_component.cpp M src/database/database.cpp M src/xmpp/biboumi_component.cpp
M louloulibs/cmake/Modules/FindLIBUUID.cmake => louloulibs/cmake/Modules/FindLIBUUID.cmake +1 -1
@@ 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")
M louloulibs/xmpp/xmpp_component.cpp => louloulibs/xmpp/xmpp_component.cpp +1 -1
@@ 14,7 14,7 @@ #include <set> #include <stdio.h> #include <uuid.h> #include <uuid/uuid.h> #include <cstdlib> #include <set>
M src/database/database.cpp => src/database/database.cpp +1 -1
@@ 4,7 4,7 @@ #include <database/database.hpp> #include <logger/logger.hpp> #include <irc/iid.hpp> #include <uuid.h> #include <uuid/uuid.h> #include <utils/get_first_non_empty.hpp> #include <utils/time.hpp>
M src/xmpp/biboumi_component.cpp => src/xmpp/biboumi_component.cpp +1 -1