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.
This commit is contained in:
Benoit Jacob
2007-12-28 16:20:00 +00:00
parent dfdad129a3
commit 86220784b6
18 changed files with 72 additions and 111 deletions

View File

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

42
Eigen/Core Normal file
View File

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

View File

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

1
Eigen/src/CMakeLists.txt Normal file
View File

@@ -0,0 +1 @@
ADD_SUBDIRECTORY(Core)

View File

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