mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
diff --git a/CMake/FindEigen3.cmake b/CMake/FindEigen3.cmake
|
|
deleted file mode 100644
|
|
index 103690ed5a..0000000000
|
|
--- a/CMake/FindEigen3.cmake
|
|
+++ /dev/null
|
|
@@ -1,33 +0,0 @@
|
|
-find_path(Eigen3_INCLUDE_DIR
|
|
- NAMES signature_of_eigen3_matrix_library
|
|
- PATH_SUFFIXES eigen3 eigen
|
|
- DOC "Eigen include directory")
|
|
-mark_as_advanced(Eigen3_INCLUDE_DIR)
|
|
-
|
|
-if (Eigen3_INCLUDE_DIR)
|
|
- file(STRINGS "${Eigen3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _Eigen3_version_lines
|
|
- REGEX "#define[ \t]+EIGEN_(WORLD|MAJOR|MINOR)_VERSION")
|
|
- string(REGEX REPLACE ".*EIGEN_WORLD_VERSION *\([0-9]*\).*" "\\1" _Eigen3_version_world "${_Eigen3_version_lines}")
|
|
- string(REGEX REPLACE ".*EIGEN_MAJOR_VERSION *\([0-9]*\).*" "\\1" _Eigen3_version_major "${_Eigen3_version_lines}")
|
|
- string(REGEX REPLACE ".*EIGEN_MINOR_VERSION *\([0-9]*\).*" "\\1" _Eigen3_version_minor "${_Eigen3_version_lines}")
|
|
- set(Eigen3_VERSION "${_Eigen3_version_world}.${_Eigen3_version_major}.${_Eigen3_version_minor}")
|
|
- unset(_Eigen3_version_world)
|
|
- unset(_Eigen3_version_major)
|
|
- unset(_Eigen3_version_minor)
|
|
- unset(_Eigen3_version_lines)
|
|
-endif ()
|
|
-
|
|
-include(FindPackageHandleStandardArgs)
|
|
-find_package_handle_standard_args(Eigen3
|
|
- REQUIRED_VARS Eigen3_INCLUDE_DIR
|
|
- VERSION_VAR Eigen3_VERSION)
|
|
-
|
|
-if (Eigen3_FOUND)
|
|
- set(Eigen3_INCLUDE_DIRS "${Eigen3_INCLUDE_DIR}")
|
|
-
|
|
- if (NOT TARGET Eigen3::Eigen3)
|
|
- add_library(Eigen3::Eigen3 INTERFACE IMPORTED)
|
|
- set_target_properties(Eigen3::Eigen3 PROPERTIES
|
|
- INTERFACE_INCLUDE_DIRECTORIES "${Eigen3_INCLUDE_DIR}")
|
|
- endif ()
|
|
-endif ()
|
|
diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake
|
|
index 7dbd33024c..343910c144 100644
|
|
--- a/CMake/vtkInstallCMakePackage.cmake
|
|
+++ b/CMake/vtkInstallCMakePackage.cmake
|
|
@@ -93,7 +93,6 @@ configure_file(
|
|
set(vtk_cmake_module_files
|
|
Finddouble-conversion.cmake
|
|
FindDirectX.cmake
|
|
- FindEigen3.cmake
|
|
FindEXPAT.cmake
|
|
FindExprTk.cmake
|
|
FindFFMPEG.cmake
|
|
diff --git a/ThirdParty/eigen/CMakeLists.txt b/ThirdParty/eigen/CMakeLists.txt
|
|
index 38e1bdc3b1..f9ce623c44 100644
|
|
--- a/ThirdParty/eigen/CMakeLists.txt
|
|
+++ b/ThirdParty/eigen/CMakeLists.txt
|
|
@@ -14,7 +14,8 @@ vtk_module_third_party(
|
|
STANDARD_INCLUDE_DIRS
|
|
EXTERNAL
|
|
PACKAGE Eigen3
|
|
- TARGETS Eigen3::Eigen3
|
|
+ TARGETS Eigen3::Eigen
|
|
+ CONFIG_MODE
|
|
STANDARD_INCLUDE_DIRS)
|
|
|
|
configure_file(
|