Mercurial > hg > orthanc
changeset 1336:a80e811ec619
fix unneeded complexity
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 30 Mar 2015 16:18:46 +0200 |
| parents | 4bed63189508 |
| children | afaa55d42ddd |
| files | Core/Uuid.cpp Resources/CMake/Compiler.cmake |
| diffstat | 2 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 <rpc.h> #else -#include <uuid.h> +#include <uuid/uuid.h> #endif }
--- 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)