[celix] branch feature/579-automatic-dependency-deduction updated: Recover Findlibuuid.cmake

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/579-automatic-dependency-deduction
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to 
refs/heads/feature/579-automatic-dependency-deduction by this push:
     new f3597df9 Recover Findlibuuid.cmake
f3597df9 is described below

commit f3597df93df23b910a389ff1089a681b9bccbb5b
Author: PengZheng <howto...@gmail.com>
AuthorDate: Sat Jul 15 00:47:15 2023 +0800

    Recover Findlibuuid.cmake
    
    Revert "Recover Findlibuuid.cmake"
    
    This reverts commit fd2c5f23f2b73441dbb2b7a9365d2b111f3108b0.
    
    Revert "Recover Findlibuuid.cmake"
    
    This reverts commit 3a3631879d2e7bd74b940df7e305f57cdf3ab9cc.
---
 cmake/Modules/Findlibuuid.cmake | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/cmake/Modules/Findlibuuid.cmake b/cmake/Modules/Findlibuuid.cmake
index f67bd742..47412d60 100644
--- a/cmake/Modules/Findlibuuid.cmake
+++ b/cmake/Modules/Findlibuuid.cmake
@@ -25,33 +25,31 @@
 if (APPLE)
     set(UUID_INCLUDE_DIRS )
     set(UUID_LIBRARIES )
-
-    find_package_handle_standard_args(UUID DEFAULT_MSG)
-
-    if (NOT TARGET UUID::lib)
-        add_library(UUID::lib INTERFACE IMPORTED)
+    find_package_handle_standard_args(libuuid DEFAULT_MSG)
+    if (NOT TARGET libuuid::libuuid)
+        add_library(libuuid::libuuid INTERFACE IMPORTED)
     endif ()
 else ()
-
     find_path(UUID_INCLUDE_DIR uuid/uuid.h
             /usr/include
             /usr/local/include )
-
     find_library(UUID_LIBRARY NAMES uuid
             PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 
/lib/i386-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu)
 
     include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(UUID DEFAULT_MSG
+    find_package_handle_standard_args(libuuid DEFAULT_MSG
             UUID_LIBRARY UUID_INCLUDE_DIR)
 
     mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY)
     set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
     set(UUID_LIBRARIES ${UUID_LIBRARY})
-    if (UUID_FOUND AND NOT TARGET UUID::lib)
-        add_library(UUID::lib SHARED IMPORTED)
-        set_target_properties(UUID::lib PROPERTIES
+
+    if (libuuid_FOUND AND NOT TARGET libuuid::libuuid)
+        add_library(libuuid::libuuid SHARED IMPORTED)
+        set_target_properties(libuuid::libuuid PROPERTIES
                 IMPORTED_LOCATION "${UUID_LIBRARY}"
                 INTERFACE_INCLUDE_DIRECTORIES "${UUID_INCLUDE_DIR}"
                 )
     endif ()
-endif ()
\ No newline at end of file
+endif ()
+