reorganization of headers, part 2/2...

doc/example.cpp

@@ -1,4 +1,4 @@
-#include "../src/All"
+#include "../src/Core.h"
 
 using namespace std;
 

doc/tutorial.cpp

@@ -1,4 +1,4 @@
-#include "../src/All"
+#include "../src/Core.h"
 
 using namespace std;
 

src/CMakeLists.txt

@@ -1,8 +1,4 @@
-set(Eigen_SRCS
+FILE(GLOB Eigen_SRCS "*.h")
-  All
-  Core
-  Manip
-)
 
 SET(INCLUDE_INSTALL_DIR
     "${CMAKE_INSTALL_PREFIX}/include/eigen2"
@@ -15,4 +11,4 @@ INSTALL(FILES
   DESTINATION ${INCLUDE_INSTALL_DIR}
   )
 
-add_subdirectory(internal)
+add_subdirectory(Core)

src/Core.h

@@ -0,0 +1,12 @@
+#include "Core/Util.h"
+#include "Core/Numeric.h"
+#include "Core/Object.h"
+#include "Core/MatrixRef.h"
+#include "Core/MatrixStorage.h"
+#include "Core/Matrix.h"
+#include "Core/Row.h"
+#include "Core/Column.h"
+#include "Core/Block.h"
+#include "Core/Minor.h"
+#include "Core/Transpose.h"
+#include "Core/Conjugate.h"

src/Core/CMakeLists.txt

@@ -1,6 +1,6 @@
-FILE(GLOB Eigen_internal_SRCS "*.h")
+FILE(GLOB Eigen_Core_SRCS "*.h")
 
 INSTALL(FILES 
-  ${Eigen_internal_SRCS}
+  ${Eigen_Core_SRCS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/internal
+  DESTINATION ${INCLUDE_INSTALL_DIR}/Core
   )

src/Core/Object.h

@@ -26,9 +26,6 @@
 #ifndef EI_OBJECT_H
 #define EI_OBJECT_H
 
-#include "Util.h"
-#include "Loop.h"
-
 template<typename Scalar, typename Derived> class EiObject
 {
     static const int RowsAtCompileTime = Derived::RowsAtCompileTime,

test/CMakeLists.txt

@@ -11,9 +11,6 @@ SET(test_SRCS
   matrixmanip.cpp
 )
 QT4_AUTOMOC(${test_SRCS})
-INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}/src
-)
 
 ADD_EXECUTABLE(test ${test_SRCS})
 TARGET_LINK_LIBRARIES(test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})

test/main.h

@@ -27,8 +27,8 @@
 #define EI_TEST_MAIN_H
 
 #include <QtTest/QtTest>
-#include <All>
+#include "../src/Core.h"
-#include <complex>
+
 #include <cstdlib>
 #include <ctime>