Author: piumarta Date: 2012-07-30 12:17:45 -0700 (Mon, 30 Jul 2012) New Revision: 2568
Modified: trunk/platforms/unix/plugins/UUIDPlugin/config.cmake Log: disable uuid plugin if no headers can be found
Modified: trunk/platforms/unix/plugins/UUIDPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2012-07-30 19:02:29 UTC (rev 2567) +++ trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2012-07-30 19:17:45 UTC (rev 2568) @@ -4,14 +4,18 @@ PLUGIN_FIND_INCLUDE (SYS_UUID sys/uuid.h) CONFIG_DEFINE (HAVE_SYS_UUID_H)
-PLUGIN_FIND_INCLUDE (SYS_UUID uuid/uuid.h) +PLUGIN_FIND_INCLUDE (UUID_UUID uuid/uuid.h) CONFIG_DEFINE (HAVE_UUID_UUID_H)
PLUGIN_FIND_LIBRARY (UUID uuid)
-IF (HAVE_LIBUUID) - SET (CMAKE_REQUIRED_LIBRARIES uuid) -ENDIF (HAVE_LIBUUID) +IF (HAVE_UUID_H OR HAVE_SYS_UUID_H OR HAVE_UUID_UUID_H) + IF (HAVE_LIBUUID) + SET (CMAKE_REQUIRED_LIBRARIES uuid) + ENDIF (HAVE_LIBUUID) +ELSE () + PLUGIN_DISABLE () +ENDIF (HAVE_UUID_H OR HAVE_SYS_UUID_H OR HAVE_UUID_UUID_H)
CHECK_FUNCTION_EXISTS (uuidgen HAVE_UUIDGEN) CONFIG_DEFINE (HAVE_UUIDGEN)
vm-dev@lists.squeakfoundation.org