Skip to content

Fix BridgeNumpy include and improve module GENEX INCLUDE variables #5765

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
blowekamp merged 3 commits into from
Feb 4, 2026
Merged

Fix BridgeNumpy include and improve module GENEX INCLUDE variables #5765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f963870
ENH: Allow modules to override GENEX INCLUDE variables
blowekamp Feb 3, 2026
b53e305
BUG: Do not add generator expressions to module system includes
blowekamp Feb 3, 2026
13844cb
BUG: Use generator expression for Python include path for build inter…
blowekamp Feb 3, 2026
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
12 changes: 3 additions & 9 deletions CMake/ITKModuleMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ endif()
endif()

# Prepare include directories with generator expressions for use in targets
set(${itk-module}_GENEX_INCLUDE_DIRS "")
Comment thread
dzenanz marked this conversation as resolved.
foreach(_dir ${${itk-module}_INCLUDE_DIRS})
list(APPEND ${itk-module}_GENEX_INCLUDE_DIRS "$<BUILD_INTERFACE:${_dir}>")
endforeach()
Expand All @@ -254,16 +253,11 @@ endif()
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${${itk-module}_INSTALL_INCLUDE_DIR}>"
)

# Prepare system include directories with generator expressions
set(${itk-module}_SYSTEM_GENEX_INCLUDE_DIRS "")
# System include directories are assumed to be external dependencies that are not installed,
# and thus do not have separate install interface paths.
if(${itk-module}_SYSTEM_INCLUDE_DIRS)
foreach(_dir ${${itk-module}_SYSTEM_INCLUDE_DIRS})
list(
APPEND
${itk-module}_SYSTEM_GENEX_INCLUDE_DIRS
"$<BUILD_INTERFACE:${_dir}>"
"$<INSTALL_INTERFACE:${_dir}>"
)
list(APPEND ${itk-module}_SYSTEM_GENEX_INCLUDE_DIRS ${_dir})
endforeach()
endif()

Expand Down
5 changes: 4 additions & 1 deletion Modules/Bridge/NumPy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
cmake_minimum_required(VERSION 3.16.3)
project(ITKBridgeNumPy)

set(ITKBridgeNumPy_SYSTEM_INCLUDE_DIRS "${Python3_INCLUDE_DIRS}")
set(
ITKBridgeNumPy_GENEX_SYSTEM_INCLUDE_DIRS
"$<BUILD_INTERFACE:${Python3_INCLUDE_DIRS}>"
)

if(NOT ITK_SOURCE_DIR)
find_package(ITK REQUIRED)
Expand Down
Loading