Merge pull request #39 from iGwkang/main

fix linking to system libraries

Author: waruqi

scripts/test-unix.sh

@@ -11,7 +11,7 @@ cmake -DXREPO_PACKAGE_VERBOSE=ON example | tee $output
 grep -E 'mode=debug pcre2' $output
 grep -E "pcre2_INCLUDE_DIRS" $output
 grep -E "pcre2_LIBRARY_DIRS" $output
-grep -E "pcre2_LIBRARIES" $output
+grep -E "pcre2_LINK_LIBRARIES" $output
 grep -E "pcre2_DEFINITIONS" $output
 grep -E "gflags prepend to CMAKE_PREFIX_PATH" $output
 grep -E "glog prepend to CMAKE_PREFIX_PATH" $output
@@ -42,4 +42,3 @@ grep -E "pcre2 $match_cached_output" $output
 grep -E "gflags 2.2.2 $match_cached_output" $output
 grep -E "example/packages/glog.lua" $output
 grep -E "myzlib $match_cached_output" $output
-

xrepo.cmake

@@ -30,6 +30,11 @@ set(XREPO_XMAKEFILE "" CACHE STRING "Xmake script file of Xrepo package")
 #          If specified, include all dependent libraries' settings in various
 #          variables. Also add all dependent libraries' install dir to
 #          CMAKE_PREFIX_PATH.
+#      USE_ABSOLUTE_LIBS: optional
+#          If specified, forces the linker to use absolute paths to library files rather than
+#          relying on the -l flag which only specifies the library name. This can be particularly
+#          useful when you need to ensure that the linker finds the correct library version,
+#          especially in environments where multiple versions of the same library might be present.
 #      MODE: optional, debug|release
 #          Pass `--mode` option to xrepo install command. If not specified,
 #          `--mode` option is not passed.
@@ -47,6 +52,7 @@ set(XREPO_XMAKEFILE "" CACHE STRING "Xmake script file of Xrepo package")
 #          [CONFIGS feature1=true,feature2=false]
 #          [CONFIGS path/to/script.lua]
 #          [DEPS]
+#          [USE_ABSOLUTE_LIBS]
 #          [MODE debug|release]
 #          [OUTPUT verbose|diagnosis|quiet]
 #          [DIRECTORY_SCOPE]
@@ -255,7 +261,7 @@ function(xrepo_package package)
         return()
     endif()
 
-    set(options "DIRECTORY_SCOPE;DEPS")
+    set(options "DIRECTORY_SCOPE;DEPS;USE_ABSOLUTE_LIBS")
     set(one_value_args CONFIGS MODE OUTPUT ALIAS)
     cmake_parse_arguments(ARG "${options}" "${one_value_args}" "" ${ARGN})
 
@@ -400,9 +406,9 @@ function(xrepo_target_packages target)
             message(STATUS "xrepo: target_link_directories(${target} ${_visibility} ${${package_name}_LIBRARY_DIRS})")
             target_link_directories(${target} ${_visibility} ${${package_name}_LIBRARY_DIRS})
         endif()
-        if((DEFINED ${package_name}_LIBRARIES) AND (NOT ARG_NO_LINK_LIBRARIES))
-            message(STATUS "xrepo: target_link_libraries(${target} ${_visibility} ${${package_name}_LIBRARIES})")
-            target_link_libraries(${target} ${_visibility} ${${package_name}_LIBRARIES})
+        if((DEFINED ${package_name}_LINK_LIBRARIES) AND (NOT ARG_NO_LINK_LIBRARIES))
+            message(STATUS "xrepo: target_link_libraries(${target} ${_visibility} ${${package_name}_LINK_LIBRARIES})")
+            target_link_libraries(${target} ${_visibility} ${${package_name}_LINK_LIBRARIES})
         endif()
         if((DEFINED ${package_name}_SYS_LIBRARIES) AND (NOT ARG_NO_LINK_LIBRARIES))
             message(STATUS "xrepo: target_link_libraries(${target} ${_visibility} ${${package_name}_SYS_LIBRARIES})")
@@ -530,36 +536,41 @@ macro(_xrepo_fetch_json)
             endif()
         endif()
 
-        # Loop over linkdirs.
-        string(JSON linkdirs_type ERROR_VARIABLE linkdirs_error TYPE ${json_output} ${idx} "linkdirs")
-        if("${linkdirs_type}" STREQUAL "STRING")
-            string(JSON dir GET ${json_output} ${idx} "linkdirs")
-            list(APPEND linkdirs ${dir})
-        elseif("${linkdirs_type}" MATCHES "ARRAY|OBJECT")
-            string(JSON linkdirs_len ERROR_VARIABLE linkdirs_error LENGTH ${json_output} ${idx} "linkdirs")
-            if("${linkdirs_error}" STREQUAL "NOTFOUND" AND NOT "${linkdirs_len}" EQUAL 0)
-                math(EXPR linkdirs_end "${linkdirs_len} - 1")
-                foreach(linkdirs_idx RANGE 0 ${linkdirs_end})
-                    string(JSON dir GET ${json_output} ${idx} "linkdirs" ${linkdirs_idx})
-                    list(APPEND linkdirs ${dir})
-                    #message(STATUS "xrepo DEBUG: linkdirs ${idx} ${linkdirs_idx} ${dir}")
-                endforeach()
+        if (NOT ARG_USE_ABSOLUTE_LIBS)
+            set (links_tag "links")
+            # Loop over linkdirs.
+            string(JSON linkdirs_type ERROR_VARIABLE linkdirs_error TYPE ${json_output} ${idx} "linkdirs")
+            if("${linkdirs_type}" STREQUAL "STRING")
+                string(JSON dir GET ${json_output} ${idx} "linkdirs")
+                list(APPEND linkdirs ${dir})
+            elseif("${linkdirs_type}" MATCHES "ARRAY|OBJECT")
+                string(JSON linkdirs_len ERROR_VARIABLE linkdirs_error LENGTH ${json_output} ${idx} "linkdirs")
+                if("${linkdirs_error}" STREQUAL "NOTFOUND" AND NOT "${linkdirs_len}" EQUAL 0)
+                    math(EXPR linkdirs_end "${linkdirs_len} - 1")
+                    foreach(linkdirs_idx RANGE 0 ${linkdirs_end})
+                        string(JSON dir GET ${json_output} ${idx} "linkdirs" ${linkdirs_idx})
+                        list(APPEND linkdirs ${dir})
+                        #message(STATUS "xrepo DEBUG: linkdirs ${idx} ${linkdirs_idx} ${dir}")
+                    endforeach()
+                endif()
             endif()
+        else()
+            set (links_tag "libfiles")
         endif()
 
         # Loop over links.
-        string(JSON links_type ERROR_VARIABLE links_error TYPE ${json_output} ${idx} "links")
+        string(JSON links_type ERROR_VARIABLE links_error TYPE ${json_output} ${idx} ${links_tag})
         if("${links_type}" STREQUAL "STRING")
-            string(JSON dir GET ${json_output} ${idx} "links")
-            list(APPEND links ${dir})
+            string(JSON libfile GET ${json_output} ${idx} ${links_tag})
+            list(APPEND links ${libfile})
         elseif("${links_type}" MATCHES "ARRAY|OBJECT")
-            string(JSON links_len ERROR_VARIABLE links_error LENGTH ${json_output} ${idx} "links")
+            string(JSON links_len ERROR_VARIABLE links_error LENGTH ${json_output} ${idx} ${links_tag})
             if("${links_error}" STREQUAL "NOTFOUND" AND NOT "${links_len}" EQUAL 0)
                 math(EXPR links_end "${links_len} - 1")
                 foreach(links_idx RANGE 0 ${links_end})
-                    string(JSON dir GET ${json_output} ${idx} "links" ${links_idx})
-                    list(APPEND links ${dir})
-                    #message(STATUS "xrepo DEBUG: links ${idx} ${links_idx} ${dir}")
+                    string(JSON libfile GET ${json_output} ${idx} ${links_tag} ${links_idx})
+                    list(APPEND links ${libfile})
+                    #message(STATUS "xrepo DEBUG: links ${idx} ${links_idx} ${libfile}")
                 endforeach()
             endif()
         endif()
@@ -618,9 +629,10 @@ macro(_xrepo_fetch_json)
     endif()
 
     if(DEFINED links)
+        set(${package_name}_LINK_LIBRARIES "${links}" CACHE INTERNAL "")
         set(${package_name}_LIBRARIES "${links}" CACHE INTERNAL "")
-        list(APPEND xrepo_vars_${package_name} ${package_name}_LIBRARIES)
-        message(STATUS "xrepo: ${package_name}_LIBRARIES ${${package_name}_LIBRARIES}")
+        list(APPEND xrepo_vars_${package_name} ${package_name}_LINK_LIBRARIES)
+        message(STATUS "xrepo: ${package_name}_LINK_LIBRARIES ${${package_name}_LINK_LIBRARIES}")
     else()
         message(STATUS "xrepo fetch --json: ${package_name} links not found")
     endif()