mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed UUID find.

Browse Source
This commit is contained in:
Armin Novak 2016-06-27 10:11:19 +02:00
parent 0d7a6b5596
commit b7f8dc3d43
3 changed files with 98 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/urbdrc/CMakeLists.txt
View File

@ -26,7 +26,12 @@ if(NOT WIN32)
endif() endif()
if(DEVD_FOUND OR UDEV_FOUND) if(DEVD_FOUND OR UDEV_FOUND)
include_directories(${UDEV_INCLUDE_DIR})
if(UUID_FOUND AND DBUS_GLIB_FOUND AND LIBUSB_1_FOUND) if(UUID_FOUND AND DBUS_GLIB_FOUND AND LIBUSB_1_FOUND)
include_directories(${UUID_INCLUDE_DIRS})
include_directories(${LIBUSB_1_INCLUDE_DIRS})
include_directories(${DBUS_GLIB_INCLUDE_DIRS})
set(URBDRC_DEPENDENCIES_FOUND TRUE) set(URBDRC_DEPENDENCIES_FOUND TRUE)
message(STATUS "Found all URBDRC dependencies") message(STATUS "Found all URBDRC dependencies")
else() else()

4
channels/urbdrc/client/urbdrc_types.h
View File

@ -30,11 +30,7 @@
#include <freerdp/channels/log.h> #include <freerdp/channels/log.h>
#include <freerdp/utils/msusb.h> #include <freerdp/utils/msusb.h>
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#include <uuid.h> #include <uuid.h>
#else
#include <uuid/uuid.h>
#endif
#include <pthread.h> #include <pthread.h>
#include <semaphore.h> #include <semaphore.h>

182
cmake/FindUUID.cmake
View File

@ -15,101 +15,105 @@
if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS) if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
# in cache already # in cache already
set(UUID_FOUND TRUE) set(UUID_FOUND TRUE)
else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS) else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
find_path(UUID_INCLUDE_DIR find_path(UUID_INCLUDE_DIR
NAMES NAMES
uuid.h uuid.h
uuid/uuid.h PATH_SUFFIXES
PATHS uuid
${UUID_DIR}/include HINTS
$ENV{UUID_DIR}/include ${UUID_DIR}/include
$ENV{UUID_DIR} $ENV{UUID_DIR}/include
${DELTA3D_EXT_DIR}/inc $ENV{UUID_DIR}
$ENV{DELTA_ROOT}/ext/inc ${DELTA3D_EXT_DIR}/inc
$ENV{DELTA_ROOT} $ENV{DELTA_ROOT}/ext/inc
~/Library/Frameworks $ENV{DELTA_ROOT}
/Library/Frameworks PATHS
/usr/local/include ~/Library/Frameworks
/usr/include /Library/Frameworks
/usr/include/gdal /usr/local/include
/sw/include # Fink /usr/include
/opt/local/include # DarwinPorts /usr/include/gdal
/opt/csw/include # Blastwave /sw/include # Fink
/opt/include /opt/local/include # DarwinPorts
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include /opt/csw/include # Blastwave
/usr/freeware/include /opt/include
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
/usr/freeware/include
)
) find_library(UUID_LIBRARY
NAMES
uuid ossp-uuid
HINTS
${UUID_DIR}/lib
$ENV{UUID_DIR}/lib
$ENV{UUID_DIR}
${DELTA3D_EXT_DIR}/lib
$ENV{DELTA_ROOT}/ext/lib
$ENV{DELTA_ROOT}
$ENV{OSG_ROOT}/lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local/lib
/usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
/opt/lib
/usr/freeware/lib64
)
find_library(UUID_LIBRARY find_library(UUID_LIBRARY_DEBUG
NAMES NAMES
uuid uuidd
PATHS HINTS
${UUID_DIR}/lib ${UUID_DIR}/lib
$ENV{UUID_DIR}/lib $ENV{UUID_DIR}/lib
$ENV{UUID_DIR} $ENV{UUID_DIR}
${DELTA3D_EXT_DIR}/lib ${DELTA3D_EXT_DIR}/lib
$ENV{DELTA_ROOT}/ext/lib $ENV{DELTA_ROOT}/ext/lib
$ENV{DELTA_ROOT} $ENV{DELTA_ROOT}
$ENV{OSG_ROOT}/lib $ENV{OSG_ROOT}/lib
~/Library/Frameworks PATHS
/Library/Frameworks ~/Library/Frameworks
/usr/local/lib /Library/Frameworks
/usr/lib /usr/local/lib
/sw/lib /usr/lib
/opt/local/lib /sw/lib
/opt/csw/lib /opt/local/lib
/opt/lib /opt/csw/lib
/usr/freeware/lib64 /opt/lib
) /usr/freeware/lib64
)
if (NOT UUID_LIBRARY AND BSD)
set(UUID_LIBRARY "")
endif(NOT UUID_LIBRARY AND BSD)
find_library(UUID_LIBRARY_DEBUG set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
NAMES set(UUID_LIBRARIES ${UUID_LIBRARY})
uuidd
PATHS
${UUID_DIR}/lib
$ENV{UUID_DIR}/lib
$ENV{UUID_DIR}
${DELTA3D_EXT_DIR}/lib
$ENV{DELTA_ROOT}/ext/lib
$ENV{DELTA_ROOT}
$ENV{OSG_ROOT}/lib
~/Library/Frameworks
/Library/Frameworks
/usr/local/lib
/usr/lib
/sw/lib
/opt/local/lib
/opt/csw/lib
/opt/lib
/usr/freeware/lib64
)
if (NOT UUID_LIBRARY AND BSD)
set(UUID_LIBRARY "")
endif(NOT UUID_LIBRARY AND BSD)
set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR}) if (UUID_INCLUDE_DIRS)
set(UUID_LIBRARIES ${UUID_LIBRARY}) if (BSD OR UUID_LIBRARIES)
set(UUID_FOUND TRUE)
endif (BSD OR UUID_LIBRARIES)
endif (UUID_INCLUDE_DIRS)
if (UUID_INCLUDE_DIRS) if (UUID_FOUND)
if (BSD OR UUID_LIBRARIES) if (NOT UUID_FIND_QUIETLY)
set(UUID_FOUND TRUE) message(STATUS "Found UUID: ${UUID_LIBRARIES}")
endif (BSD OR UUID_LIBRARIES) endif (NOT UUID_FIND_QUIETLY)
endif (UUID_INCLUDE_DIRS) else (UUID_FOUND)
if (UUID_FIND_REQUIRED)
message(FATAL_ERROR "Could not find UUID")
endif (UUID_FIND_REQUIRED)
endif (UUID_FOUND)
if (UUID_FOUND) # show the UUID_INCLUDE_DIRS and UUID_LIBRARIES variables only in the advanced view
if (NOT UUID_FIND_QUIETLY) mark_as_advanced(UUID_INCLUDE_DIRS UUID_LIBRARIES)
message(STATUS "Found UUID: ${UUID_LIBRARIES}")
endif (NOT UUID_FIND_QUIETLY)
else (UUID_FOUND)
if (UUID_FIND_REQUIRED)
message(FATAL_ERROR "Could not find UUID")
endif (UUID_FIND_REQUIRED)
endif (UUID_FOUND)
# show the UUID_INCLUDE_DIRS and UUID_LIBRARIES variables only in the advanced view
mark_as_advanced(UUID_INCLUDE_DIRS UUID_LIBRARIES)
endif (UUID_LIBRARIES AND UUID_INCLUDE_DIRS) endif (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)