Skip to content

try again #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
poshul merged 2 commits into from
Dec 5, 2025
Merged

try again #166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6035da8
try again
poshul Dec 4, 2025
55fdcfb
also fix absolute paths in ArrowTargets-*.cmake
poshul Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 49 additions & 18 deletions libraries.cmake/arrow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,28 +90,45 @@ if (MSVC)
endif()

# Fix Arrow CMake config files to be relocatable
# Arrow generates absolute paths in ArrowTargets.cmake which breaks when the
# package is moved to a different location. Replace absolute paths with
# relative paths based on CMAKE_CURRENT_LIST_DIR.
# Arrow generates absolute paths in ArrowTargets.cmake and ArrowTargets-*.cmake
# which breaks when the package is moved to a different location.
set(ARROW_CMAKE_DIR "${PROJECT_BINARY_DIR}/lib/cmake/Arrow")
set(PARQUET_CMAKE_DIR "${PROJECT_BINARY_DIR}/lib/cmake/Parquet")

# Convert absolute build path to relative path for Arrow
# Normalize path separators for replacement
file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}" PROJECT_BINARY_DIR_NORMALIZED)

# Fix 1: Replace hardcoded _IMPORT_PREFIX in ArrowTargets.cmake
set(ARROW_RELOCATABLE_REPLACEMENT "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}/../../..\" ABSOLUTE)")
set(ARROW_ORIGINAL_PATTERN "set(_IMPORT_PREFIX \"${PROJECT_BINARY_DIR_NORMALIZED}\")")

message(STATUS "Arrow relocatability fix:")
message(STATUS " Build dir: ${PROJECT_BINARY_DIR_NORMALIZED}")

# Process all Arrow cmake files (ArrowTargets.cmake and ArrowTargets-*.cmake)
file(GLOB ARROW_TARGET_FILES "${ARROW_CMAKE_DIR}/ArrowTargets*.cmake")
foreach(TARGET_FILE ${ARROW_TARGET_FILES})
file(READ "${TARGET_FILE}" TARGET_CONTENT)
string(REPLACE "${PROJECT_BINARY_DIR}/lib" "\${_IMPORT_PREFIX}/lib" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "${PROJECT_BINARY_DIR}/include" "\${_IMPORT_PREFIX}/include" TARGET_CONTENT "${TARGET_CONTENT}")

# Fix the _IMPORT_PREFIX definition (in ArrowTargets.cmake)
string(REPLACE "${ARROW_ORIGINAL_PATTERN}" "${ARROW_RELOCATABLE_REPLACEMENT}" TARGET_CONTENT "${TARGET_CONTENT}")

# Fix hardcoded paths in IMPORTED_LOCATION and other properties (in ArrowTargets-*.cmake)
# Replace absolute paths with ${_IMPORT_PREFIX} relative paths
string(REPLACE "\"${PROJECT_BINARY_DIR_NORMALIZED}/" "\"\${_IMPORT_PREFIX}/" TARGET_CONTENT "${TARGET_CONTENT}")

file(WRITE "${TARGET_FILE}" "${TARGET_CONTENT}")
message(STATUS " Fixed: ${TARGET_FILE}")
endforeach()

# Convert absolute build path to relative path for Parquet
# Process all Parquet cmake files
file(GLOB PARQUET_TARGET_FILES "${PARQUET_CMAKE_DIR}/ParquetTargets*.cmake")
foreach(TARGET_FILE ${PARQUET_TARGET_FILES})
file(READ "${TARGET_FILE}" TARGET_CONTENT)
string(REPLACE "${PROJECT_BINARY_DIR}/lib" "\${_IMPORT_PREFIX}/lib" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "${PROJECT_BINARY_DIR}/include" "\${_IMPORT_PREFIX}/include" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "${ARROW_ORIGINAL_PATTERN}" "${ARROW_RELOCATABLE_REPLACEMENT}" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "\"${PROJECT_BINARY_DIR_NORMALIZED}/" "\"\${_IMPORT_PREFIX}/" TARGET_CONTENT "${TARGET_CONTENT}")
file(WRITE "${TARGET_FILE}" "${TARGET_CONTENT}")
message(STATUS " Fixed: ${TARGET_FILE}")
endforeach()

message(STATUS "Fixed Arrow/Parquet CMake configs for relocatability")
Expand Down Expand Up @@ -193,28 +210,42 @@ else() ## Linux/MacOS
endif()

# Fix Arrow CMake config files to be relocatable
# Arrow generates absolute paths in ArrowTargets.cmake which breaks when the
# package is moved to a different location. Replace absolute paths with
# relative paths based on CMAKE_CURRENT_LIST_DIR.
# Arrow generates absolute paths in ArrowTargets.cmake and ArrowTargets-*.cmake
# which breaks when the package is moved to a different location.
set(ARROW_CMAKE_DIR "${PROJECT_BINARY_DIR}/lib/cmake/Arrow")
set(PARQUET_CMAKE_DIR "${PROJECT_BINARY_DIR}/lib/cmake/Parquet")

# Convert absolute build path to relative path for Arrow
# Fix 1: Replace hardcoded _IMPORT_PREFIX in ArrowTargets.cmake
set(ARROW_RELOCATABLE_REPLACEMENT "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}/../../..\" ABSOLUTE)")
set(ARROW_ORIGINAL_PATTERN "set(_IMPORT_PREFIX \"${PROJECT_BINARY_DIR}\")")

message(STATUS "Arrow relocatability fix:")
message(STATUS " Build dir: ${PROJECT_BINARY_DIR}")

# Process all Arrow cmake files (ArrowTargets.cmake and ArrowTargets-*.cmake)
file(GLOB ARROW_TARGET_FILES "${ARROW_CMAKE_DIR}/ArrowTargets*.cmake")
foreach(TARGET_FILE ${ARROW_TARGET_FILES})
file(READ "${TARGET_FILE}" TARGET_CONTENT)
string(REPLACE "${PROJECT_BINARY_DIR}/lib" "\${_IMPORT_PREFIX}/lib" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "${PROJECT_BINARY_DIR}/include" "\${_IMPORT_PREFIX}/include" TARGET_CONTENT "${TARGET_CONTENT}")

# Fix the _IMPORT_PREFIX definition (in ArrowTargets.cmake)
string(REPLACE "${ARROW_ORIGINAL_PATTERN}" "${ARROW_RELOCATABLE_REPLACEMENT}" TARGET_CONTENT "${TARGET_CONTENT}")

# Fix hardcoded paths in IMPORTED_LOCATION and other properties (in ArrowTargets-*.cmake)
# Replace absolute paths with ${_IMPORT_PREFIX} relative paths
string(REPLACE "\"${PROJECT_BINARY_DIR}/" "\"\${_IMPORT_PREFIX}/" TARGET_CONTENT "${TARGET_CONTENT}")

file(WRITE "${TARGET_FILE}" "${TARGET_CONTENT}")
message(STATUS " Fixed: ${TARGET_FILE}")
endforeach()

# Convert absolute build path to relative path for Parquet
# Process all Parquet cmake files
file(GLOB PARQUET_TARGET_FILES "${PARQUET_CMAKE_DIR}/ParquetTargets*.cmake")
foreach(TARGET_FILE ${PARQUET_TARGET_FILES})
file(READ "${TARGET_FILE}" TARGET_CONTENT)
string(REPLACE "${PROJECT_BINARY_DIR}/lib" "\${_IMPORT_PREFIX}/lib" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "${PROJECT_BINARY_DIR}/include" "\${_IMPORT_PREFIX}/include" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "${ARROW_ORIGINAL_PATTERN}" "${ARROW_RELOCATABLE_REPLACEMENT}" TARGET_CONTENT "${TARGET_CONTENT}")
string(REPLACE "\"${PROJECT_BINARY_DIR}/" "\"\${_IMPORT_PREFIX}/" TARGET_CONTENT "${TARGET_CONTENT}")
file(WRITE "${TARGET_FILE}" "${TARGET_CONTENT}")
message(STATUS " Fixed: ${TARGET_FILE}")
endforeach()

message(STATUS "Fixed Arrow/Parquet CMake configs for relocatability")
Expand Down