part 2 of the reorganization. Benefits/changes:

1) Eigen2 co-installable with Eigen1 without conflict, without affecting programs including either. 2) #include<Eigen/Core> without the .h without conflict with the Core/ directory 3) Uniformize coding style of the CMakeLists.
2025-08-10 10:49:04 +08:00 · 2007-12-28 16:20:00 +00:00 · 2007-12-28 16:20:00 +00:00 · 86220784b6
commit 86220784b6
parent dfdad129a3
18 changed files with 72 additions and 111 deletions
--- 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)
--- 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)
+ADD_SUBDIRECTORY(src)
--- a/Eigen/Core
+++ 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
--- a/Eigen/Core.h
+++ b/Eigen/Core.h
@ -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
--- a/Eigen/src/CMakeLists.txt
+++ b/Eigen/src/CMakeLists.txt
@ -0,0 +1 @@
+ADD_SUBDIRECTORY(Core)
--- 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
  )
--- 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        = 
--- 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
--- a/doc/example.cpp
+++ b/doc/example.cpp
@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>

 USING_PART_OF_NAMESPACE_EIGEN

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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**)
--- a/doc/tutorial.cpp
+++ b/doc/tutorial.cpp
@ -1,4 +1,4 @@
-#include <Eigen/Core.h>
+#include <Eigen/Core>

 USING_PART_OF_NAMESPACE_EIGEN

--- 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>