FindUUID: Always define UUID::UUID on Apple platforms (#128)

On Apple platforms, the headers of libuuid and its symbols are provided by the OS SDK, so no further linking is necessary. Fix #127 Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
gazebosim · Dec 15, 2020 · 4118be2 · 4118be2
1 parent 7085179
commit 4118be2
Showing 1 changed file with 39 additions and 30 deletions.
diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake
@@ -16,42 +16,51 @@
 ########################################
 # Find uuid
 if (UNIX)
-  include(IgnPkgConfig)
-  ign_pkg_check_modules_quiet(UUID uuid)
+  if(NOT APPLE)
+    include(IgnPkgConfig)
+    ign_pkg_check_modules_quiet(UUID uuid)
 
-  if(NOT UUID_FOUND)
-    include(IgnManualSearch)
-    ign_manual_search(UUID
-                      HEADER_NAMES "uuid.h"
-                      LIBRARY_NAMES "uuid libuuid"
-                      PATH_SUFFIXES "uuid")
-  endif()
+    if(NOT UUID_FOUND)
+      include(IgnManualSearch)
+      ign_manual_search(UUID
+                        HEADER_NAMES "uuid.h"
+                        LIBRARY_NAMES "uuid libuuid"
+                        PATH_SUFFIXES "uuid")
+    endif()
 
-  # The pkg-config or the manual search will place
-  # <uuid_install_prefix>/include/uuid in INTERFACE_INCLUDE_DIRECTORIES,
-  # but some projects exepect to use <uuid_install_prefix>/include, so
-  # we add it as well.
-  # See https://github.com/ignitionrobotics/ign-cmake/issues/103
-  if(TARGET UUID::UUID)
-    get_property(uuid_include_dirs
-      TARGET UUID::UUID
-      PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+    # The pkg-config or the manual search will place
+    # <uuid_install_prefix>/include/uuid in INTERFACE_INCLUDE_DIRECTORIES,
+    # but some projects exepect to use <uuid_install_prefix>/include, so
+    # we add it as well.
+    # See https://github.com/ignitionrobotics/ign-cmake/issues/103
+    if(TARGET UUID::UUID)
+      get_property(uuid_include_dirs
+        TARGET UUID::UUID
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 
-    set(uuid_include_dirs_extended ${uuid_include_dirs})
+      set(uuid_include_dirs_extended ${uuid_include_dirs})
 
-    foreach(include_dir IN LISTS uuid_include_dirs)
-      if(include_dir MATCHES "uuid$")
-        get_filename_component(include_dir_parent ${include_dir} DIRECTORY)
-        list(APPEND uuid_include_dirs_extended ${include_dir_parent})
-      endif()
-    endforeach()
+      foreach(include_dir IN LISTS uuid_include_dirs)
+        if(include_dir MATCHES "uuid$")
+          get_filename_component(include_dir_parent ${include_dir} DIRECTORY)
+          list(APPEND uuid_include_dirs_extended ${include_dir_parent})
+        endif()
+      endforeach()
 
-    list(REMOVE_DUPLICATES uuid_include_dirs_extended)
+      list(REMOVE_DUPLICATES uuid_include_dirs_extended)
 
-    set_property(
-      TARGET UUID::UUID
-      PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-      ${uuid_include_dirs_extended})
+      set_property(
+        TARGET UUID::UUID
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        ${uuid_include_dirs_extended})
+    endif()
+  else()
+    # On Apple platforms the UUID library is provided by the OS SDK
+    # See https://github.com/ignitionrobotics/ign-cmake/issues/127
+    set(UUID_FOUND TRUE)
+    if(NOT TARGET UUID::UUID)
+      add_library(UUID::UUID INTERFACE IMPORTED)
+    endif()
   endif()
 
   include(FindPackageHandleStandardArgs)