[arrow] branch master updated: GH-33816: [CI][Conan] Use TARGET_FILE for portability (#33817)

[ko...@apache.org]

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

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 63967ac00d GH-33816: [CI][Conan] Use TARGET_FILE for portability (#33817)
63967ac00d is described below

commit 63967ac00dbf788a2309a70f949e13f3d3e93f24
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Sun Jan 22 08:51:40 2023 +0900

    GH-33816: [CI][Conan] Use TARGET_FILE for portability (#33817)
    
    
    ### What changes are included in this PR?
    
    Use `$<TARGET_FILE>` instead of manual library path resolution.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * Closes: #33816
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 36 +++++++++--------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 490cb09fe8..50a37129f4 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2572,31 +2572,6 @@ endmacro()
 
 if(ARROW_WITH_BZ2)
   resolve_dependency(BZip2 PC_PACKAGE_NAMES bzip2)
-  if(${BZip2_SOURCE} STREQUAL "SYSTEM" AND NOT bzip2_PC_FOUND)
-    set(ARROW_BZIP2_CONFIGS "")
-    if(BZIP2_LIBRARY_RELEASE)
-      string(APPEND ARROW_PC_LIBS_PRIVATE
-             " $<$<CONFIG:RELEASE>:${BZIP2_LIBRARY_RELEASE}>")
-      list(APPEND ARROW_BZIP2_CONFIGS "$<CONFIG:RELEASE>")
-    endif()
-    if(BZIP2_LIBRARY_DEBUG)
-      string(APPEND ARROW_PC_LIBS_PRIVATE " $<$<CONFIG:DEBUG>:${BZIP2_LIBRARY_DEBUG}>")
-      list(APPEND ARROW_BZIP2_CONFIGS "$<CONFIG:DEBUG>")
-    endif()
-    string(APPEND ARROW_PC_LIBS_PRIVATE " $<$<NOT:$<OR:")
-    if(CMAKE_VERSION VERSION_LESS "3.12")
-      string(REPLACE ";" "," ARROW_BZIP2_CONFIGS_CSV "${ARROW_BZIP2_CONFIGS}")
-    else()
-      list(JOIN ARROW_BZIP2_CONFIGS "," ARROW_BZIP2_CONFIGS_CSV)
-    endif()
-    string(APPEND ARROW_PC_LIBS_PRIVATE "${ARROW_BZIP2_CONFIGS_CSV}>>:")
-    if(BZIP2_LIBRARY)
-      string(APPEND ARROW_PC_LIBS_PRIVATE "${BZIP2_LIBRARY}")
-    else()
-      string(APPEND ARROW_PC_LIBS_PRIVATE "${BZIP2_LIBRARIES}")
-    endif()
-    string(APPEND ARROW_PC_LIBS_PRIVATE ">")
-  endif()
 
   if(NOT TARGET BZip2::BZip2)
     add_library(BZip2::BZip2 UNKNOWN IMPORTED)
@@ -2604,6 +2579,17 @@ if(ARROW_WITH_BZ2)
                           PROPERTIES IMPORTED_LOCATION "${BZIP2_LIBRARIES}"
                                      INTERFACE_INCLUDE_DIRECTORIES "${BZIP2_INCLUDE_DIR}")
   endif()
+
+  if(${BZip2_SOURCE} STREQUAL "SYSTEM" AND NOT bzip2_PC_FOUND)
+    get_target_property(BZIP2_TYPE BZip2::BZip2 TYPE)
+    if(BZIP2_TYPE STREQUAL "INTERFACE_LIBRARY")
+      # Conan
+      string(APPEND ARROW_PC_LIBS_PRIVATE
+             " $<TARGET_FILE:CONAN_LIB::bzip2_bz2_$<CONFIG>>")
+    else()
+      string(APPEND ARROW_PC_LIBS_PRIVATE " $<TARGET_FILE:BZip2::BZip2>")
+    endif()
+  endif()
 endif()
 
 macro(build_utf8proc)