Skip to content

Commit f6eb95b

Browse files
committed
COMP: Address greptile review on vendored Eigen 5 import
- Restore @EIGEN3_TARGETS_FILE@ substitution in Eigen3Config.cmake.in. - Remove duplicate option(ITK_USE_EIGEN_MPL2_ONLY) declaration. - Remove commented-out binary-dir generator expression. USE_SYSTEM_EIGEN for 3.3+ unaffected (all under itkeigen, only configured when USE_SYSTEM_EIGEN=OFF).
1 parent c4c420a commit f6eb95b

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

Modules/ThirdParty/Eigen3/src/itkeigen/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -949,8 +949,7 @@ add_library (ITKInternalEigen3::Eigen ALIAS eigen_internal)
949949
# This would wrongly enforce EIGEN_MPL2_ONLY to other libraries using Eigen.
950950
# We wrap this definition in ITK_USE_EIGEN_MPL2_ONLY, and only enabling it internally in the dashboards and CI,
951951
# to avoid introducing GPL code from Eigen3 internally in ITK.
952-
option(ITK_USE_EIGEN_MPL2_ONLY "Set compile definition EIGEN_MPL2_ONLY for ITKInternalEigen3." OFF)
953-
mark_as_advanced(ITK_USE_EIGEN_MPL2_ONLY)
952+
# (ITK_USE_EIGEN_MPL2_ONLY is declared once near line 844 of this file.)
954953

955954
if(ITK_USE_EIGEN_MPL2_ONLY)
956955
target_compile_definitions (eigen_internal INTERFACE "EIGEN_MPL2_ONLY")
@@ -961,7 +960,6 @@ endif()
961960
# INSTALL: headers require pre-prend itkeigen/Eigen/X.
962961
target_include_directories (eigen_internal SYSTEM INTERFACE
963962
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
964-
# $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/..>
965963
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
966964
)
967965

Modules/ThirdParty/Eigen3/src/itkeigen/cmake/Eigen3Config.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
@PACKAGE_INIT@
55

66
if (NOT TARGET Eigen3::Eigen)
7-
include ("${CMAKE_CURRENT_LIST_DIR}/Eigen3Targets.cmake")
7+
include ("${CMAKE_CURRENT_LIST_DIR}/@EIGEN3_TARGETS_FILE@")
88
endif (NOT TARGET Eigen3::Eigen)

0 commit comments

Comments
 (0)