Skip to content

GH-26394: [Python] Don't use target_include_directories() for imported target #33606

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
kou merged 4 commits into from
Jan 12, 2023
Merged

GH-26394: [Python] Don't use target_include_directories() for imported target #33606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
851e235
GH-26394: [Python] Don't use target_include_directories() for importe…
kou Jan 11, 2023
04ffaef
Use INTERFACE_INCLUDE_DIRECTORIES
kou Jan 11, 2023
a909789
Remove garbage
kou Jan 12, 2023
2175f99
Can't use target_link_libraries()
kou Jan 12, 2023
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
10 changes: 8 additions & 2 deletions cpp/cmake_modules/FindNumPy.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,11 @@ find_package_message(NUMPY
set(NUMPY_FOUND TRUE)

add_library(Python3::NumPy INTERFACE IMPORTED)
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)
if(CMAKE_VERSION VERSION_LESS 3.11)
set_target_properties(Python3::NumPy PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${NUMPY_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES Python3::Module)
else()
target_include_directories(Python3::NumPy INTERFACE ${NUMPY_INCLUDE_DIRS})
target_link_libraries(Python3::NumPy INTERFACE Python3::Module)
endif()
7 changes: 6 additions & 1 deletion cpp/cmake_modules/FindPythonLibsNew.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,12 @@ find_package_message(PYTHON
"${PYTHON_EXECUTABLE}${PYTHON_VERSION}")

add_library(Python3::Module SHARED IMPORTED)
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
if(CMAKE_VERSION VERSION_LESS 3.11)
set_target_properties(Python3::Module PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
${PYTHON_INCLUDE_DIRS})
else()
target_include_directories(Python3::Module INTERFACE ${PYTHON_INCLUDE_DIRS})
endif()
set_target_properties(Python3::Module PROPERTIES
IMPORTED_LOCATION "${PYTHON_LIBRARIES}"
IMPORTED_IMPLIB "${PYTHON_LIBRARIES}")
Expand Down