Skip to content

Commit 0952355

Browse files
Build - Vendor Eigen 3.4.0 into mmSolverLibs
This is to avoid having to download anything at build time.
1 parent 2127d2c commit 0952355

708 files changed

Lines changed: 256871 additions & 17 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,16 @@ include(MMSolverUtils)
129129
add_subdirectory(share)
130130

131131
if (MMSOLVER_BUILD_PLUGIN)
132+
# Set up vendored Eigen variables for external dependencies that need them
133+
set(eigen_vendored_dir "${CMAKE_CURRENT_SOURCE_DIR}/lib/thirdparty/eigen")
134+
if(EXISTS "${eigen_vendored_dir}")
135+
set(Eigen3_FOUND TRUE)
136+
set(Eigen3_VERSION "3.4.0")
137+
set(Eigen3_INCLUDE_DIR "${eigen_vendored_dir}")
138+
set(Eigen3_INCLUDE_DIRS "${eigen_vendored_dir}")
139+
message(STATUS "Set up vendored Eigen variables for main build dependencies: ${eigen_vendored_dir}")
140+
endif()
141+
132142
# Finds and builds external (third-party) dependencies.
133143
#
134144
# NOTE: Dependencies are handled in mmsolverlibs sub-project.

lib/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,17 @@ message(STATUS "Rust Depend On Libraries: ${rust_depend_on_libraries}")
9696
# Build options for mmsolverlibs dependencies are inherited from
9797
# parent scope.
9898

99+
# Set up vendored Eigen variables for external dependencies that need
100+
# them.
101+
set(eigen_vendored_dir "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/eigen")
102+
if(EXISTS "${eigen_vendored_dir}")
103+
set(Eigen3_FOUND TRUE)
104+
set(Eigen3_VERSION "3.4.0")
105+
set(Eigen3_INCLUDE_DIR "${eigen_vendored_dir}")
106+
set(Eigen3_INCLUDE_DIRS "${eigen_vendored_dir}")
107+
message(STATUS "Set up vendored Eigen variables for dependencies: ${eigen_vendored_dir}")
108+
endif()
109+
99110
# Finds and builds external (third-party) dependencies for
100111
# mmsolverlibs.
101112
include(FindAndBuildMmsolverDependencies)

lib/share/cmake/modules/FindAndBuildMmsolverDependencies.cmake

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ find_package(glog 0.7.1 REQUIRED)
5252
# https://github.com/devernay/cminpack
5353
find_package(cminpack 1.3.8 REQUIRED)
5454

55-
# Eigen - Linear Algebra library
56-
#
57-
# https://gitlab.com/libeigen/eigen
58-
#
59-
# Eigen is used by both Ceres and OpenMVG and provides data types
60-
# shared across the ABI boundary and is also used in mmSolver. Eigen
61-
# also supplies a sparse-matrix that is used by Ceres.
62-
#
63-
# v3.4.0 is also the version used by OpenMVG.
64-
find_package(Eigen3 3.4.0 REQUIRED)
65-
6655
# Ceres Solver - Non-Linear Least-Squares Fits solver
6756
#
6857
# Ceres Solver is used by OpenMVG for various least-squares

lib/thirdparty/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
# Building third-party projects.
2020
#
2121

22+
add_subdirectory(eigen)
2223
add_subdirectory(openMVG)

lib/thirdparty/eigen/.clang-format

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
BasedOnStyle: Google
3+
ColumnLimit: 120
4+
---
5+
Language: Cpp
6+
BasedOnStyle: Google
7+
ColumnLimit: 120
8+
StatementMacros:
9+
- EIGEN_STATIC_ASSERT
10+
- EIGEN_INITIALIZE_COEFFS_IF_THAT_OPTION_IS_ENABLED
11+
- EIGEN_INTERNAL_DENSE_STORAGE_CTOR_PLUGIN
12+
SortIncludes: false
13+
AttributeMacros:
14+
- EIGEN_STRONG_INLINE
15+
- EIGEN_ALWAYS_INLINE
16+
- EIGEN_DEVICE_FUNC
17+
- EIGEN_DONT_INLINE
18+
- EIGEN_DEPRECATED
19+
- EIGEN_UNUSED
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# Copyright (C) 2025 David Cattermole.
2+
#
3+
# This file is part of mmSolver.
4+
#
5+
# mmSolver is free software: you can redistribute it and/or modify it
6+
# under the terms of the GNU Lesser General Public License as
7+
# published by the Free Software Foundation, either version 3 of the
8+
# License, or (at your option) any later version.
9+
#
10+
# mmSolver is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU Lesser General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU Lesser General Public License
16+
# along with mmSolver. If not, see <https://www.gnu.org/licenses/>.
17+
# ---------------------------------------------------------------------
18+
#
19+
# CMakeLists.txt for vendored Eigen.
20+
#
21+
# Eigen is a header-only C++ template library for linear algebra:
22+
# matrices, vectors, numerical solvers, and related algorithms.
23+
#
24+
# This vendored copy ensures consistent version across all build environments
25+
# and eliminates external dependency management.
26+
#
27+
28+
# Eigen is a header-only library, so we create an INTERFACE target
29+
# Create 'eigen' target (Eigen3 target may already exist from parent CMake)
30+
add_library(eigen INTERFACE)
31+
32+
# Only create Eigen3 target if it doesn't already exist
33+
if(NOT TARGET Eigen3)
34+
add_library(Eigen3 INTERFACE)
35+
endif()
36+
37+
# Only create Eigen3::Eigen alias if it doesn't already exist
38+
if(NOT TARGET Eigen3::Eigen)
39+
add_library(Eigen3::Eigen ALIAS eigen)
40+
endif()
41+
42+
# Set the include directory for the Eigen headers
43+
set(eigen_include_dir "${CMAKE_CURRENT_SOURCE_DIR}")
44+
45+
# Set interface include directories for eigen target
46+
target_include_directories(eigen INTERFACE
47+
$<BUILD_INTERFACE:${eigen_include_dir}>
48+
$<INSTALL_INTERFACE:include/>
49+
)
50+
51+
# Set interface include directories for Eigen3 target if we created it here
52+
# (If it was created earlier, it should already have the correct paths)
53+
get_target_property(eigen3_include_dirs Eigen3 INTERFACE_INCLUDE_DIRECTORIES)
54+
if(NOT eigen3_include_dirs OR eigen3_include_dirs STREQUAL "eigen3_include_dirs-NOTFOUND")
55+
target_include_directories(Eigen3 INTERFACE
56+
$<BUILD_INTERFACE:${eigen_include_dir}>
57+
$<INSTALL_INTERFACE:include/>
58+
)
59+
endif()
60+
61+
# Set C++ standard requirement (Eigen 3.4.0 requires C++14 minimum)
62+
target_compile_features(eigen INTERFACE cxx_std_14)
63+
64+
# Set C++ standard for Eigen3 if we created it here
65+
get_target_property(eigen3_cxx_features Eigen3 INTERFACE_COMPILE_FEATURES)
66+
if(NOT eigen3_cxx_features OR eigen3_cxx_features STREQUAL "eigen3_cxx_features-NOTFOUND")
67+
target_compile_features(Eigen3 INTERFACE cxx_std_14)
68+
endif()
69+
70+
# Install Eigen headers - now properly organized in Eigen subdirectory
71+
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Eigen/
72+
DESTINATION include/Eigen
73+
FILES_MATCHING PATTERN "*" PATTERN "*.h" PATTERN "*.hpp")
74+
75+
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unsupported
76+
DESTINATION include
77+
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
78+
79+
# Install Eigen targets
80+
include(MMCommonUtils)
81+
mm_common_install_target_library("mmsolverlibs_cpp" eigen)
82+
# Note: Eigen3 target is exported early in the main CMakeLists.txt to resolve dependency ordering
83+
84+
# Set version information
85+
set_target_properties(eigen PROPERTIES
86+
VERSION "3.4.0"
87+
EXPORT_NAME "Eigen3::Eigen"
88+
)
89+
90+
# Set properties for Eigen3 if we created it here
91+
if(TARGET Eigen3)
92+
get_target_property(eigen3_version Eigen3 VERSION)
93+
if(NOT eigen3_version OR eigen3_version STREQUAL "eigen3_version-NOTFOUND")
94+
set_target_properties(Eigen3 PROPERTIES
95+
VERSION "3.4.0"
96+
EXPORT_NAME "Eigen3"
97+
)
98+
endif()
99+
endif()
Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
/*
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.
203+
*/

0 commit comments

Comments
 (0)