# HG changeset patch # User Sebastien Jodogne # Date 1427725126 -7200 # Node ID a80e811ec619a4a2a96c24f0e1a734055ce08c0c # Parent 4bed63189508ff76a4fe8ba7af754fb1b7c26788 fix unneeded complexity diff -r 4bed63189508 -r a80e811ec619 Core/Uuid.cpp --- a/Core/Uuid.cpp Mon Mar 30 15:40:38 2015 +0200 +++ b/Core/Uuid.cpp Mon Mar 30 16:18:46 2015 +0200 @@ -40,7 +40,7 @@ #ifdef WIN32 #include #else -#include +#include #endif } diff -r 4bed63189508 -r a80e811ec619 Resources/CMake/Compiler.cmake --- a/Resources/CMake/Compiler.cmake Mon Mar 30 15:40:38 2015 +0200 +++ b/Resources/CMake/Compiler.cmake Mon Mar 30 16:18:46 2015 +0200 @@ -61,13 +61,6 @@ set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") link_libraries(uuid pthread rt dl) - find_path(LIBUUID_INCLUDE_DIR uuid.h - /usr/include - /usr/include/uuid - ) - message("libuuid include dir: ${LIBUUID_INCLUDE_DIR}") - include_directories(${LIBUUID_INCLUDE_DIR}) - elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") add_definitions( -DWINVER=0x0501 @@ -92,7 +85,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") CHECK_INCLUDE_FILES(rpc.h HAVE_UUID_H) else() - CHECK_INCLUDE_FILES(uuid.h HAVE_UUID_H) + CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H) endif() if (NOT HAVE_UUID_H)