SHARED_IMPLIB -> IMPORT_LIB

Because CMake doesn't use SHARED prefix for import library such as
CMAKE_IMPORT_LIBRARY_SUFFIX.

cpp/cmake_modules/FindArrow.cmake

@@ -19,11 +19,11 @@
 # This module defines
 # ARROW_FOUND, whether Arrow has been found
 # ARROW_FULL_SO_VERSION, full shared object version of found Arrow "100.0.0"
+# ARROW_IMPORT_LIB, path to libarrow's import library (Windows only)
 # ARROW_INCLUDE_DIR, directory containing headers
 # ARROW_LIBS, deprecated. Use ARROW_LIB_DIR instead
 # ARROW_LIB_DIR, directory containing Arrow libraries
-# ARROW_SHARED_IMPLIB, path to libarrow's import library (MSVC only)
-# ARROW_SHARED_IMP_LIB, deprecated. Use ARROW_SHARED_IMPLIB instead
+# ARROW_SHARED_IMP_LIB, deprecated. Use ARROW_IMPORT_LIB instead
 # ARROW_SHARED_LIB, path to libarrow's shared library
 # ARROW_SO_VERSION, shared object version of found Arrow such as "100"
 # ARROW_STATIC_LIB, path to libarrow.a
@@ -70,14 +70,10 @@ function(arrow_build_shared_library_name output_variable base_name)
  PARENT_SCOPE)
 endfunction()
 
-function(arrow_build_shared_import_library_name output_variable base_name)
- if(MSVC)
- set(${output_variable} "${CMAKE_SHARED_LIBRARY_PREFIX}${base_name}.lib" PARENT_SCOPE)
- else()
- set(${output_variable}
- "${CMAKE_SHARED_LIBRARY_PREFIX}${base_name}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- PARENT_SCOPE)
- endif()
+function(arrow_build_import_library_name output_variable base_name)
+ set(${output_variable}
+ "${CMAKE_IMPORT_LIBRARY_PREFIX}${base_name}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+ PARENT_SCOPE)
 endfunction()
 
 function(arrow_build_static_library_name output_variable base_name)
@@ -127,16 +123,15 @@ macro(arrow_find_package_home)
  set_target_properties(${target_shared}
  PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${include_dir}")
  endif()
- find_library(${prefix}_shared_implib
- NAMES "${shared_implib_name}"
+ find_library(${prefix}_import_lib
+ NAMES "${import_lib_name}"
  PATHS "${home}"
  PATH_SUFFIXES ${ARROW_SEARCH_LIB_PATH_SUFFIXES}
  NO_DEFAULT_PATH)
- set(shared_implib "${${prefix}_shared_implib}")
- set(${prefix}_SHARED_IMPLIB "${shared_implib}" PARENT_SCOPE)
- if(shared_implib)
- set_target_properties(${target_shared}
- PROPERTIES IMPORTED_IMPLIB "${shared_implib}")
+ set(import_lib "${${prefix}_import_lib}")
+ set(${prefix}_IMPORT_LIB "${import_lib}" PARENT_SCOPE)
+ if(import_lib)
+ set_target_properties(${target_shared} PROPERTIES IMPORTED_IMPLIB "${import_lib}")
  endif()
  endif()
 
@@ -250,7 +245,7 @@ function(arrow_find_package
  cmake_package_name
  pkg_config_name)
  arrow_build_shared_library_name(shared_lib_name ${base_name})
- arrow_build_shared_import_library_name(shared_implib_name ${base_name})
+ arrow_build_import_library_name(import_lib_name ${base_name})
  arrow_build_static_library_name(static_lib_name ${base_name})
 
  set(target_shared ${base_name}_shared)
@@ -345,11 +340,11 @@ set(ARROW_ABI_VERSION ${ARROW_SO_VERSION})
 mark_as_advanced(ARROW_ABI_VERSION
  ARROW_CONFIG_SUFFIXES
  ARROW_FULL_SO_VERSION
+ ARROW_IMPORT_LIB
  ARROW_INCLUDE_DIR
  ARROW_LIBS
  ARROW_LIB_DIR
  ARROW_SEARCH_LIB_PATH_SUFFIXES
- ARROW_SHARED_IMPLIB
  ARROW_SHARED_IMP_LIB
  ARROW_SHARED_LIB
  ARROW_SO_VERSION
@@ -376,6 +371,6 @@ if(Arrow_FOUND AND NOT Arrow_FIND_QUIETLY)
  message(STATUS "Arrow SO and ABI version: ${ARROW_SO_VERSION}")
  message(STATUS "Arrow full SO version: ${ARROW_FULL_SO_VERSION}")
  message(STATUS "Found the Arrow core shared library: ${ARROW_SHARED_LIB}")
- message(STATUS "Found the Arrow core shared import library: ${ARROW_SHARED_IMPLIB}")
+ message(STATUS "Found the Arrow core import library: ${ARROW_IMPORT_LIB}")
  message(STATUS "Found the Arrow core static library: ${ARROW_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindArrowCUDA.cmake

@@ -22,11 +22,11 @@
 #
 # This module defines
 # ARROW_CUDA_FOUND, whether Arrow CUDA has been found
+# ARROW_CUDA_IMPORT_LIB, path to libarrow_cuda's import library (Windows only)
 # ARROW_CUDA_INCLUDE_DIR, directory containing headers
 # ARROW_CUDA_LIBS, deprecated. Use ARROW_CUDA_LIB_DIR instead
 # ARROW_CUDA_LIB_DIR, directory containing Arrow CUDA libraries
-# ARROW_CUDA_SHARED_IMPLIB, path to libarrow_cuda's import library (MSVC only)
-# ARROW_CUDA_SHARED_IMP_LIB, deprecated. Use ARROW_CUDA_SHARED_IMPLIB instead
+# ARROW_CUDA_SHARED_IMP_LIB, deprecated. Use ARROW_CUDA_IMPORT_LIB instead
 # ARROW_CUDA_SHARED_LIB, path to libarrow_cuda's shared library
 # ARROW_CUDA_STATIC_LIB, path to libarrow_cuda.a
 
@@ -62,10 +62,10 @@ else()
  set(ARROW_CUDA_VERSION_MATCH FALSE)
 endif()
 
-mark_as_advanced(ARROW_CUDA_INCLUDE_DIR
+mark_as_advanced(ARROW_CUDA_IMPORT_LIB
+ ARROW_CUDA_INCLUDE_DIR
  ARROW_CUDA_LIBS
  ARROW_CUDA_LIB_DIR
- ARROW_CUDA_SHARED_IMPLIB
  ARROW_CUDA_SHARED_IMP_LIB
  ARROW_CUDA_SHARED_LIB
  ARROW_CUDA_STATIC_LIB
@@ -84,7 +84,6 @@ set(ARROW_CUDA_FOUND ${ArrowCUDA_FOUND})
 if(ArrowCUDA_FOUND AND NOT ArrowCUDA_FIND_QUIETLY)
  message(STATUS "Found the Arrow CUDA by ${ARROW_CUDA_FIND_APPROACH}")
  message(STATUS "Found the Arrow CUDA shared library: ${ARROW_CUDA_SHARED_LIB}")
- message(
- STATUS "Found the Arrow CUDA shared import library: ${ARROW_CUDA_SHARED_IMPLIB}")
+ message(STATUS "Found the Arrow CUDA import library: ${ARROW_CUDA_IMPORT_LIB}")
  message(STATUS "Found the Arrow CUDA static library: ${ARROW_CUDA_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindArrowDataset.cmake

@@ -22,9 +22,10 @@
 #
 # This module defines
 # ARROW_DATASET_FOUND, whether Arrow Dataset has been found
+# ARROW_DATASET_IMPORT_LIB,
+# path to libarrow_dataset's import library (Windows only)
 # ARROW_DATASET_INCLUDE_DIR, directory containing headers
 # ARROW_DATASET_LIB_DIR, directory containing Arrow Dataset libraries
-# ARROW_DATASET_SHARED_IMPLIB, path to libarrow_dataset's import library (MSVC only)
 # ARROW_DATASET_SHARED_LIB, path to libarrow_dataset's shared library
 # ARROW_DATASET_STATIC_LIB, path to libarrow_dataset.a
 
@@ -60,10 +61,10 @@ else()
  set(ARROW_DATASET_VERSION_MATCH FALSE)
 endif()
 
-mark_as_advanced(ARROW_DATASET_INCLUDE_DIR
+mark_as_advanced(ARROW_DATASET_IMPORT_LIB
+ ARROW_DATASET_INCLUDE_DIR
  ARROW_DATASET_LIBS
  ARROW_DATASET_LIB_DIR
- ARROW_DATASET_SHARED_IMPLIB
  ARROW_DATASET_SHARED_IMP_LIB
  ARROW_DATASET_SHARED_LIB
  ARROW_DATASET_STATIC_LIB
@@ -82,8 +83,6 @@ set(ARROW_DATASET_FOUND ${ArrowDataset_FOUND})
 if(ArrowDataset_FOUND AND NOT ArrowDataset_FIND_QUIETLY)
  message(STATUS "Found the Arrow Dataset by ${ARROW_DATASET_FIND_APPROACH}")
  message(STATUS "Found the Arrow Dataset shared library: ${ARROW_DATASET_SHARED_LIB}")
- message(
- STATUS "Found the Arrow Dataset shared import library: ${ARROW_DATASET_SHARED_IMPLIB}"
- )
+ message(STATUS "Found the Arrow Dataset import library: ${ARROW_DATASET_IMPORT_LIB}")
  message(STATUS "Found the Arrow Dataset static library: ${ARROW_DATASET_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindArrowFlight.cmake

@@ -22,11 +22,12 @@
 #
 # This module defines
 # ARROW_FLIGHT_FOUND, whether Flight has been found
+# ARROW_FLIGHT_IMPORT_LIB,
+# path to libarrow_flight's import library (Windows only)
 # ARROW_FLIGHT_INCLUDE_DIR, directory containing headers
 # ARROW_FLIGHT_LIBS, deprecated. Use ARROW_FLIGHT_LIB_DIR instead
 # ARROW_FLIGHT_LIB_DIR, directory containing Flight libraries
-# ARROW_FLIGHT_SHARED_IMPLIB, path to libarrow_flight's import library (MSVC only)
-# ARROW_FLIGHT_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SHARED_IMPLIB instead
+# ARROW_FLIGHT_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_IMPORT_LIB instead
 # ARROW_FLIGHT_SHARED_LIB, path to libarrow_flight's shared library
 # ARROW_FLIGHT_STATIC_LIB, path to libarrow_flight.a
 
@@ -62,10 +63,10 @@ else()
  set(ARROW_FLIGHT_VERSION_MATCH FALSE)
 endif()
 
-mark_as_advanced(ARROW_FLIGHT_INCLUDE_DIR
+mark_as_advanced(ARROW_FLIGHT_IMPORT_LIB
+ ARROW_FLIGHT_INCLUDE_DIR
  ARROW_FLIGHT_LIBS
  ARROW_FLIGHT_LIB_DIR
- ARROW_FLIGHT_SHARED_IMPLIB
  ARROW_FLIGHT_SHARED_IMP_LIB
  ARROW_FLIGHT_SHARED_LIB
  ARROW_FLIGHT_STATIC_LIB
@@ -84,7 +85,6 @@ set(ARROW_FLIGHT_FOUND ${ArrowFlight_FOUND})
 if(ArrowFlight_FOUND AND NOT ArrowFlight_FIND_QUIETLY)
  message(STATUS "Found the Arrow Flight by ${ARROW_FLIGHT_FIND_APPROACH}")
  message(STATUS "Found the Arrow Flight shared library: ${ARROW_FLIGHT_SHARED_LIB}")
- message(
- STATUS "Found the Arrow Flight shared import library: ${ARROW_FLIGHT_SHARED_IMPLIB}")
+ message(STATUS "Found the Arrow Flight import library: ${ARROW_FLIGHT_IMPORT_LIB}")
  message(STATUS "Found the Arrow Flight static library: ${ARROW_FLIGHT_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindArrowPython.cmake

@@ -22,9 +22,10 @@
 #
 # This module defines
 # ARROW_PYTHON_FOUND, whether Arrow Python has been found
+# ARROW_PYTHON_IMPORT_LIB,
+# path to libarrow_python's import library (Windows only)
 # ARROW_PYTHON_INCLUDE_DIR, directory containing headers
 # ARROW_PYTHON_LIB_DIR, directory containing Arrow Python libraries
-# ARROW_PYTHON_SHARED_IMPLIB, path to libarrow_python's import library (MSVC only)
 # ARROW_PYTHON_SHARED_LIB, path to libarrow_python's shared library
 # ARROW_PYTHON_STATIC_LIB, path to libarrow_python.a
 
@@ -60,10 +61,10 @@ else()
  set(ARROW_PYTHON_VERSION_MATCH FALSE)
 endif()
 
-mark_as_advanced(ARROW_PYTHON_INCLUDE_DIR
+mark_as_advanced(ARROW_PYTHON_IMPORT_LIB
+ ARROW_PYTHON_INCLUDE_DIR
  ARROW_PYTHON_LIBS
  ARROW_PYTHON_LIB_DIR
- ARROW_PYTHON_SHARED_IMPLIB
  ARROW_PYTHON_SHARED_IMP_LIB
  ARROW_PYTHON_SHARED_LIB
  ARROW_PYTHON_STATIC_LIB
@@ -82,7 +83,6 @@ set(ARROW_PYTHON_FOUND ${ArrowPython_FOUND})
 if(ArrowPython_FOUND AND NOT ArrowPython_FIND_QUIETLY)
  message(STATUS "Found the Arrow Python by ${ARROW_PYTHON_FIND_APPROACH}")
  message(STATUS "Found the Arrow Python shared library: ${ARROW_PYTHON_SHARED_LIB}")
- message(
- STATUS "Found the Arrow Python shared import library: ${ARROW_PYTHON_SHARED_IMPLIB}")
+ message(STATUS "Found the Arrow Python import library: ${ARROW_PYTHON_IMPORT_LIB}")
  message(STATUS "Found the Arrow Python static library: ${ARROW_PYTHON_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindArrowPythonFlight.cmake

@@ -23,11 +23,11 @@
 #
 # This module defines
 # ARROW_PYTHON_FLIGHT_FOUND, whether Arrow Python Flight has been found
+# ARROW_PYTHON_FLIGHT_IMPORT_LIB,
+# path to libarrow_python_flight's import library (Windows only)
 # ARROW_PYTHON_FLIGHT_INCLUDE_DIR, directory containing headers
 # ARROW_PYTHON_FLIGHT_LIB_DIR,
 # directory containing Arrow Python Flight libraries
-# ARROW_PYTHON_FLIGHT_SHARED_IMPLIB,
-# path to libarrow_python_flight's import library (MSVC only)
 # ARROW_PYTHON_FLIGHT_SHARED_LIB, path to libarrow_python_flight's shared library
 # ARROW_PYTHON_FLIGHT_STATIC_LIB, path to libarrow_python_flight.a
 
@@ -66,10 +66,10 @@ else()
  set(ARROW_PYTHON_FLIGHT_VERSION_MATCH FALSE)
 endif()
 
-mark_as_advanced(ARROW_PYTHON_FLIGHT_INCLUDE_DIR
+mark_as_advanced(ARROW_PYTHON_FLIGHT_IMPORT_LIB
+ ARROW_PYTHON_FLIGHT_INCLUDE_DIR
  ARROW_PYTHON_FLIGHT_LIBS
  ARROW_PYTHON_FLIGHT_LIB_DIR
- ARROW_PYTHON_FLIGHT_SHARED_IMPLIB
  ARROW_PYTHON_FLIGHT_SHARED_IMP_LIB
  ARROW_PYTHON_FLIGHT_SHARED_LIB
  ARROW_PYTHON_FLIGHT_STATIC_LIB
@@ -92,8 +92,7 @@ if(ArrowPythonFlight_FOUND AND NOT ArrowPythonFlight_FIND_QUIETLY)
  "Found the Arrow Python Flight shared library: ${ARROW_PYTHON_FLIGHT_SHARED_LIB}")
  message(
  STATUS
- "Found the Arrow Python Flight shared import library: ${ARROW_PYTHON_FLIGHT_SHARED_IMPLIB}"
- )
+ "Found the Arrow Python Flight import library: ${ARROW_PYTHON_FLIGHT_IMPORT_LIB}")
  message(
  STATUS
  "Found the Arrow Python Flight static library: ${ARROW_PYTHON_FLIGHT_STATIC_LIB}")

cpp/cmake_modules/FindGandiva.cmake

@@ -22,11 +22,11 @@
 #
 # This module defines
 # GANDIVA_FOUND, whether Gandiva has been found
+# GANDIVA_IMPORT_LIB, path to libgandiva's import library (Windows only)
 # GANDIVA_INCLUDE_DIR, directory containing headers
 # GANDIVA_LIBS, deprecated. Use GANDIVA_LIB_DIR instead
 # GANDIVA_LIB_DIR, directory containing Gandiva libraries
-# GANDIVA_SHARED_IMPLIB, path to libgandiva's import library (MSVC only)
-# GANDIVA_SHARED_IMP_LIB, deprecated. Use GANDIVA_SHARED_IMPLIB instead
+# GANDIVA_SHARED_IMP_LIB, deprecated. Use GANDIVA_IMPORT_LIB instead
 # GANDIVA_SHARED_LIB, path to libgandiva's shared library
 # GANDIVA_SO_VERSION, shared object version of found Gandiva such as "100"
 # GANDIVA_STATIC_LIB, path to libgandiva.a
@@ -66,10 +66,10 @@ else()
 endif()
 
 mark_as_advanced(GANDIVA_ABI_VERSION
+ GANDIVA_IMPORT_LIB
  GANDIVA_INCLUDE_DIR
  GANDIVA_LIBS
  GANDIVA_LIB_DIR
- GANDIVA_SHARED_IMPLIB
  GANDIVA_SHARED_IMP_LIB
  GANDIVA_SHARED_LIB
  GANDIVA_SO_VERSION
@@ -90,6 +90,6 @@ set(GANDIVA_FOUND ${Gandiva_FOUND})
 if(Gandiva_FOUND AND NOT Gandiva_FIND_QUIETLY)
  message(STATUS "Found the Gandiva by ${GANDIVA_FIND_APPROACH}")
  message(STATUS "Found the Gandiva shared library: ${GANDIVA_SHARED_LIB}")
- message(STATUS "Found the Gandiva shared import library: ${GANDIVA_SHARED_IMPLIB}")
+ message(STATUS "Found the Gandiva import library: ${GANDIVA_IMPORT_LIB}")
  message(STATUS "Found the Gandiva static library: ${GANDIVA_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindParquet.cmake

@@ -22,11 +22,11 @@
 #
 # This module defines
 # PARQUET_FOUND, whether Parquet has been found
+# PARQUET_IMPORT_LIB, path to libparquet's import library (Windows only)
 # PARQUET_INCLUDE_DIR, directory containing headers
 # PARQUET_LIBS, deprecated. Use PARQUET_LIB_DIR instead
 # PARQUET_LIB_DIR, directory containing Parquet libraries
-# PARQUET_SHARED_IMPLIB, path to libparquet's import library (MSVC only)
-# PARQUET_SHARED_IMP_LIB, deprecated. Use PARQUET_SHARED_IMPLIB instead
+# PARQUET_SHARED_IMP_LIB, deprecated. Use PARQUET_IMPORT_LIB instead
 # PARQUET_SHARED_LIB, path to libparquet's shared library
 # PARQUET_SO_VERSION, shared object version of found Parquet such as "100"
 # PARQUET_STATIC_LIB, path to libparquet.a
@@ -102,10 +102,10 @@ if(ARROW_FOUND)
 endif()
 
 mark_as_advanced(PARQUET_ABI_VERSION
+ PARQUET_IMPORT_LIB
  PARQUET_INCLUDE_DIR
  PARQUET_LIBS
  PARQUET_LIB_DIR
- PARQUET_SHARED_IMPLIB
  PARQUET_SHARED_IMP_LIB
  PARQUET_SHARED_LIB
  PARQUET_SO_VERSION
@@ -124,6 +124,6 @@ set(PARQUET_FOUND ${Parquet_FOUND})
 if(Parquet_FOUND AND NOT Parquet_FIND_QUIETLY)
  message(STATUS "Parquet version: ${PARQUET_VERSION} (${PARQUET_FIND_APPROACH})")
  message(STATUS "Found the Parquet shared library: ${PARQUET_SHARED_LIB}")
- message(STATUS "Found the Parquet shared import library: ${PARQUET_SHARED_IMPLIB}")
+ message(STATUS "Found the Parquet import library: ${PARQUET_IMPORT_LIB}")
  message(STATUS "Found the Parquet static library: ${PARQUET_STATIC_LIB}")
 endif()

cpp/cmake_modules/FindPlasma.cmake

@@ -23,11 +23,11 @@
 # This module defines
 # PLASMA_EXECUTABLE, deprecated. Use PLASMA_STORE_SERVER instead
 # PLASMA_FOUND, whether Plasma has been found
+# PLASMA_IMPORT_LIB, path to libplasma's import library (Windows only)
 # PLASMA_INCLUDE_DIR, directory containing headers
 # PLASMA_LIBS, deprecated. Use PLASMA_LIB_DIR instead
 # PLASMA_LIB_DIR, directory containing Plasma libraries
-# PLASMA_SHARED_IMPLIB, path to libplasma's import library (MSVC only)
-# PLASMA_SHARED_IMP_LIB, deprecated. Use PLASMA_SHARED_IMPLIB instead
+# PLASMA_SHARED_IMP_LIB, deprecated. Use PLASMA_IMPORT_LIB instead
 # PLASMA_SHARED_LIB, path to libplasma's shared library
 # PLASMA_SO_VERSION, shared object version of found Plasma such as "100"
 # PLASMA_STATIC_LIB, path to libplasma.a
@@ -75,10 +75,10 @@ endif()
 
 mark_as_advanced(PLASMA_ABI_VERSION
  PLASMA_EXECUTABLE
+ PLASMA_IMPORT_LIB
  PLASMA_INCLUDE_DIR
  PLASMA_LIBS
  PLASMA_LIB_DIR
- PLASMA_SHARED_IMPLIB
  PLASMA_SHARED_IMP_LIB
  PLASMA_SHARED_LIB
  PLASMA_SO_VERSION
@@ -100,6 +100,6 @@ if(Plasma_FOUND AND NOT Plasma_FIND_QUIETLY)
  message(STATUS "Found the Plasma by ${PLASMA_FIND_APPROACH}")
  message(STATUS "Found the plasma-store-server: ${PLASMA_STORE_SERVER}")
  message(STATUS "Found the Plasma shared library: ${PLASMA_SHARED_LIB}")
- message(STATUS "Found the Plasma shared import library: ${PLASMA_SHARED_IMPLIB}")
+ message(STATUS "Found the Plasma import library: ${PLASMA_IMPORT_LIB}")
  message(STATUS "Found the Plasma static library: ${PLASMA_STATIC_LIB}")
 endif()