aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt26
-rw-r--r--Eigen/CMakeLists.txt4
-rw-r--r--Eigen/Core42
-rw-r--r--Eigen/Core.h42
-rw-r--r--Eigen/src/CMakeLists.txt1
-rw-r--r--Eigen/src/Core/CMakeLists.txt2
-rw-r--r--doc/Doxyfile.in44
-rw-r--r--doc/benchmark.cpp2
-rw-r--r--doc/example.cpp2
-rw-r--r--doc/examples/class_Block.cpp2
-rw-r--r--doc/examples/class_Cast.cpp2
-rw-r--r--doc/examples/class_Column.cpp2
-rw-r--r--doc/examples/class_DynBlock.cpp2
-rw-r--r--doc/examples/class_Eval.cpp2
-rw-r--r--doc/examples/class_Row.cpp2
-rw-r--r--doc/snippets/compile_snippet.cpp.in2
-rw-r--r--doc/tutorial.cpp2
-rw-r--r--test/main.h2
18 files changed, 72 insertions, 111 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97397c0f6..90b969972 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,18 @@
-project(Eigen)
+PROJECT(Eigen)
-OPTION(BUILD_TESTS "Build tests" OFF)
-OPTION(BUILD_EXAMPLES "Build examples" OFF)
+OPTION(BUILD_TESTS "Build tests" OFF)
+OPTION(BUILD_DOC "Build documentation and examples" OFF)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
-if(CMAKE_COMPILER_IS_GNUCXX)
- if (CMAKE_SYSTEM_NAME MATCHES Linux)
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common -fstrict-aliasing")
- endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-endif (CMAKE_COMPILER_IS_GNUCXX)
+IF(CMAKE_COMPILER_IS_GNUCXX)
+ IF(CMAKE_SYSTEM_NAME MATCHES Linux)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common -fstrict-aliasing")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES Linux)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-add_subdirectory(Eigen)
-add_subdirectory(test)
-add_subdirectory(doc)
+ADD_SUBDIRECTORY(Eigen)
+ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(doc)
diff --git a/Eigen/CMakeLists.txt b/Eigen/CMakeLists.txt
index 12c48c4a4..fba8219a0 100644
--- a/Eigen/CMakeLists.txt
+++ b/Eigen/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(INCLUDE_INSTALL_DIR
INSTALL(FILES
${Eigen_SRCS}
- DESTINATION ${INCLUDE_INSTALL_DIR}
+ DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen
)
-add_subdirectory(Core) \ No newline at end of file
+ADD_SUBDIRECTORY(src) \ No newline at end of file
diff --git a/Eigen/Core b/Eigen/Core
new file mode 100644
index 000000000..0689921a9
--- /dev/null
+++ b/Eigen/Core
@@ -0,0 +1,42 @@
+#include <iostream>
+#include <complex>
+#include <cassert>
+
+namespace Eigen {
+
+#include "src/Core/Util.h"
+#include "src/Core/NumTraits.h"
+#include "src/Core/MathFunctions.h"
+#include "src/Core/MatrixBase.h"
+#include "src/Core/Coeffs.h"
+#include "src/Core/OperatorEquals.h"
+#include "src/Core/MatrixRef.h"
+#include "src/Core/MatrixStorage.h"
+#include "src/Core/Matrix.h"
+#include "src/Core/Cast.h"
+#include "src/Core/Eval.h"
+#include "src/Core/ScalarMultiple.h"
+#include "src/Core/Sum.h"
+#include "src/Core/Difference.h"
+#include "src/Core/Product.h"
+#include "src/Core/Opposite.h"
+#include "src/Core/Row.h"
+#include "src/Core/Column.h"
+#include "src/Core/DynBlock.h"
+#include "src/Core/Block.h"
+#include "src/Core/Minor.h"
+#include "src/Core/Transpose.h"
+#include "src/Core/Conjugate.h"
+#include "src/Core/Trace.h"
+#include "src/Core/Dot.h"
+#include "src/Core/Random.h"
+#include "src/Core/Zero.h"
+#include "src/Core/Ones.h"
+#include "src/Core/DiagonalMatrix.h"
+#include "src/Core/DiagonalCoeffs.h"
+#include "src/Core/Identity.h"
+#include "src/Core/Fuzzy.h"
+#include "src/Core/Map.h"
+#include "src/Core/IO.h"
+
+} // namespace Eigen
diff --git a/Eigen/Core.h b/Eigen/Core.h
deleted file mode 100644
index aa679896e..000000000
--- a/Eigen/Core.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <iostream>
-#include <complex>
-#include <cassert>
-
-namespace Eigen {
-
-#include "Core/Util.h"
-#include "Core/NumTraits.h"
-#include "Core/MathFunctions.h"
-#include "Core/MatrixBase.h"
-#include "Core/Coeffs.h"
-#include "Core/OperatorEquals.h"
-#include "Core/MatrixRef.h"
-#include "Core/MatrixStorage.h"
-#include "Core/Matrix.h"
-#include "Core/Cast.h"
-#include "Core/Eval.h"
-#include "Core/ScalarMultiple.h"
-#include "Core/Sum.h"
-#include "Core/Difference.h"
-#include "Core/Product.h"
-#include "Core/Opposite.h"
-#include "Core/Row.h"
-#include "Core/Column.h"
-#include "Core/DynBlock.h"
-#include "Core/Block.h"
-#include "Core/Minor.h"
-#include "Core/Transpose.h"
-#include "Core/Conjugate.h"
-#include "Core/Trace.h"
-#include "Core/Dot.h"
-#include "Core/Random.h"
-#include "Core/Zero.h"
-#include "Core/Ones.h"
-#include "Core/DiagonalMatrix.h"
-#include "Core/DiagonalCoeffs.h"
-#include "Core/Identity.h"
-#include "Core/Fuzzy.h"
-#include "Core/Map.h"
-#include "Core/IO.h"
-
-} // namespace Eigen
diff --git a/Eigen/src/CMakeLists.txt b/Eigen/src/CMakeLists.txt
new file mode 100644
index 000000000..941dff553
--- /dev/null
+++ b/Eigen/src/CMakeLists.txt
@@ -0,0 +1 @@
+ADD_SUBDIRECTORY(Core)
diff --git a/Eigen/src/Core/CMakeLists.txt b/Eigen/src/Core/CMakeLists.txt
index dc4473416..963cd50e6 100644
--- a/Eigen/src/Core/CMakeLists.txt
+++ b/Eigen/src/Core/CMakeLists.txt
@@ -2,5 +2,5 @@ FILE(GLOB Eigen_Core_SRCS "*.h")
INSTALL(FILES
${Eigen_Core_SRCS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/Core
+ DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen/src/Core
)
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 8b9aa62af..0a250144a 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -89,49 +89,9 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
INPUT = ${CMAKE_SOURCE_DIR}/doc ${CMAKE_SOURCE_DIR}/Eigen
INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c \
- *.cc \
- *.cxx \
- *.cpp \
- *.c++ \
- *.d \
- *.java \
- *.ii \
- *.ixx \
- *.ipp \
- *.i++ \
- *.inl \
- *.h \
- *.hh \
- *.hxx \
- *.hpp \
- *.h++ \
- *.idl \
- *.odl \
- *.cs \
- *.php \
- *.php3 \
- *.inc \
- *.m \
- *.mm \
- *.dox \
- *.py \
- *.C \
- *.CC \
- *.C++ \
- *.II \
- *.I++ \
- *.H \
- *.HH \
- *.H++ \
- *.CS \
- *.PHP \
- *.PHP3 \
- *.M \
- *.MM \
- *.PY
+FILE_PATTERNS = *
RECURSIVE = NO
-EXCLUDE =
+EXCLUDE = CMake* *.txt
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXCLUDE_SYMBOLS =
diff --git a/doc/benchmark.cpp b/doc/benchmark.cpp
index bf476acda..d21f28403 100644
--- a/doc/benchmark.cpp
+++ b/doc/benchmark.cpp
@@ -1,6 +1,6 @@
// g++ -O3 -DNDEBUG benchmark.cpp -o benchmark && time ./benchmark
-#include <Eigen/Core.h>
+#include <Eigen/Core>
using namespace std;
USING_PART_OF_NAMESPACE_EIGEN
diff --git a/doc/example.cpp b/doc/example.cpp
index 66c51b2c3..23893488a 100644
--- a/doc/example.cpp
+++ b/doc/example.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
diff --git a/doc/examples/class_Block.cpp b/doc/examples/class_Block.cpp
index efd90ddbb..a6025231e 100644
--- a/doc/examples/class_Block.cpp
+++ b/doc/examples/class_Block.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
diff --git a/doc/examples/class_Cast.cpp b/doc/examples/class_Cast.cpp
index 5ac9ed3f9..f50fd2f4f 100644
--- a/doc/examples/class_Cast.cpp
+++ b/doc/examples/class_Cast.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
diff --git a/doc/examples/class_Column.cpp b/doc/examples/class_Column.cpp
index 83501f3d6..bab6eaedc 100644
--- a/doc/examples/class_Column.cpp
+++ b/doc/examples/class_Column.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
diff --git a/doc/examples/class_DynBlock.cpp b/doc/examples/class_DynBlock.cpp
index 638055fa9..589d1204e 100644
--- a/doc/examples/class_DynBlock.cpp
+++ b/doc/examples/class_DynBlock.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
diff --git a/doc/examples/class_Eval.cpp b/doc/examples/class_Eval.cpp
index bcf66c316..8c638fe79 100644
--- a/doc/examples/class_Eval.cpp
+++ b/doc/examples/class_Eval.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
diff --git a/doc/examples/class_Row.cpp b/doc/examples/class_Row.cpp
index cd928772d..12c144c85 100644
--- a/doc/examples/class_Row.cpp
+++ b/doc/examples/class_Row.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
diff --git a/doc/snippets/compile_snippet.cpp.in b/doc/snippets/compile_snippet.cpp.in
index 9f7d568e5..bc79e2553 100644
--- a/doc/snippets/compile_snippet.cpp.in
+++ b/doc/snippets/compile_snippet.cpp.in
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
int main(int, char**)
diff --git a/doc/tutorial.cpp b/doc/tutorial.cpp
index 63ed3e5a5..b0627083d 100644
--- a/doc/tutorial.cpp
+++ b/doc/tutorial.cpp
@@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
diff --git a/test/main.h b/test/main.h
index 59c6b2de7..c0c56ffa6 100644
--- a/test/main.h
+++ b/test/main.h
@@ -29,7 +29,7 @@
#include <QtTest/QtTest>
#define EIGEN_INTERNAL_DEBUGGING
-#include <Eigen/Core.h>
+#include <Eigen/Core>
#include <cstdlib>
#include <ctime>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 19:46:58 +0000