More cleanup, add CMakeLists for the testsuite. Now need to port it

to QTestLib :/

6 files changed, 62 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3db80e33..fca3dfc59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(eigen2)
+project(Eigen)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
diff --git a/tvmet-1.7.1/CMakeLists.txt b/tvmet-1.7.1/CMakeLists.txt
index 2ae409720..de32e4420 100644
--- a/tvmet-1.7.1/CMakeLists.txt
+++ b/tvmet-1.7.1/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory(include)
\ No newline at end of file
+ADD_SUBDIRECTORY(include)
+ADD_SUBDIRECTORY(testsuite)
\ No newline at end of file
diff --git a/tvmet-1.7.1/include/tvmet/CMakeLists.txt b/tvmet-1.7.1/include/tvmet/CMakeLists.txt
index 68d5a5f28..0194b0b6c 100644
--- a/tvmet-1.7.1/include/tvmet/CMakeLists.txt
+++ b/tvmet-1.7.1/include/tvmet/CMakeLists.txt
@@ -7,13 +7,6 @@ INCLUDE (CheckSysvMath)
 INCLUDE (CheckLongDouble)
 INCLUDE (CheckLongLong)
 
-# the following are directories where stuff will be installed to
-set(INCLUDE_INSTALL_DIR
-    "${CMAKE_INSTALL_PREFIX}/include/tvmet"
-    CACHE PATH
-    "The subdirectory to the header prefix"
-    FORCE)
-
 FILE(GLOB tvmet_header_SRCS "*.h")
 
 CHECK_INCLUDE_FILES (sys/time.h TVMET_HAVE_SYS_TIME_H)
@@ -26,6 +19,13 @@ CHECK_SYSV_MATH     (TVMET_HAVE_SYSV_MATH)
 CHECK_LONG_DOUBLE   (TVMET_HAVE_LONG_DOUBLE)
 CHECK_LONG_DOUBLE   (TVMET_HAVE_LONG_LONG)
 
+# the following are directories where stuff will be installed to
+set(INCLUDE_INSTALL_DIR
+    "${CMAKE_INSTALL_PREFIX}/include/tvmet"
+    CACHE PATH
+    "The subdirectory to the header prefix"
+    FORCE)
+
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
                ${INCLUDE_INSTALL_DIR}/config.h)
 
diff --git a/tvmet-1.7.1/include/tvmet/config.h.cmake b/tvmet-1.7.1/include/tvmet/config.h.cmake
index bc951be6e..d07bd21ce 100644
--- a/tvmet-1.7.1/include/tvmet/config.h.cmake
+++ b/tvmet-1.7.1/include/tvmet/config.h.cmake
@@ -28,5 +28,7 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine TVMET_HAVE_UNISTD_H  1
 
+#define _tvmet_restrict __restrict__
+
 /* _INCLUDE_TVMET_CONFIG_H */
 #endif
diff --git a/tvmet-1.7.1/include/tvmet/tvmet.h b/tvmet-1.7.1/include/tvmet/tvmet.h
index 7e66fefd7..abf7a7a0e 100644
--- a/tvmet-1.7.1/include/tvmet/tvmet.h
+++ b/tvmet-1.7.1/include/tvmet/tvmet.h
@@ -51,25 +51,6 @@
 #  include <tvmet/config/config-vc71.h>
 #endif
 
-
-// give up for these cases
-#if !defined(TVMET_HAVE_MUTABLE)
-#  error "Your compiler doesn't support the mutable keyword! Giving up."
-#endif
-
-#if !defined(TVMET_HAVE_TYPENAME)
-#  error "Your compiler doesn't support the typename keyword! Giving up."
-#endif
-
-#if !defined(TVMET_HAVE_NAMESPACES)
-#  error "Your compiler doesn't support the namespace concept! Giving up."
-#endif
-
-#if !defined(TVMET_HAVE_PARTIAL_SPECIALIZATION)
-#  error "Your compiler doesn't support partial specialization! Giving up."
-#endif
-
-
 /*
  * other compiler specific stuff
  */
diff --git a/tvmet-1.7.1/testsuite/CMakeLists.txt b/tvmet-1.7.1/testsuite/CMakeLists.txt
new file mode 100644
index 000000000..045714dbc
--- /dev/null
+++ b/tvmet-1.7.1/testsuite/CMakeLists.txt
@@ -0,0 +1,50 @@
+INCLUDE(CheckIncludeFiles)
+
+IF(BUILD_TESTS)
+
+ENABLE_TESTING()
+
+FIND_PACKAGE(Qt4 REQUIRED)
+
+INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
+
+SET(testsuite_SOURCES
+  main.cc
+  SelfTest.h SelfTest.cc
+  TestNumericTraits.h TestNumericTraits.cc
+  TestNumericTraitsComplex.h TestNumericTraitsComplex.cc
+  TestConstruction.h TestConstruction.cc
+  TestComplexMatrix.h TestComplexMatrix.cc
+  TestComplexVector.h TestComplexVector.cc
+  TestDimension.h TestDimension.cc
+  TestMathOps.h TestMathOps.cc
+  TestMatrixEval.h TestMatrixEval.cc
+  TestMatrixFunctions.h TestMatrixFunctions.cc
+  TestMatrixOperators.h TestMatrixOperators.cc
+  TestSTL.h TestSTL.cc
+  TestUnFunc.h TestUnFunc.cc
+  TestVectorEval.h TestVectorEval.cc
+  TestVectorFunctions.h TestVectorFunctions.cc
+  TestVectorOperators.h TestVectorOperators.cc
+  TestXpr.h TestXpr.cc
+  TestXprMatrixFunctions.h TestXprMatrixFunctions.cc
+  TestXprMatrixOperators.h TestXprMatrixOperators.cc
+  TestXprVectorFunctions.h TestXprVectorFunctions.cc
+  TestXprVectorOperators.h TestXprVectorOperators.cc
+  TestUnloops.h TestUnloops.cc
+  TestMatrixElementwise.h TestMatrixElementwise.cc
+)
+
+QT4_AUTOMOC(${testsuite_SOURCES})
+
+INCLUDE_DIRECTORIES(${CPPUNIT_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}/tvmet-1.7.1/include
+  ${CMAKE_INSTALL_PREFIX}/include)
+
+ADD_EXECUTABLE(testsuite ${testsuite_SOURCES})
+
+TARGET_LINK_LIBRARIES(testsuite ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+
+ADD_TEST(Eigen testsuite)
+
+ENDIF(BUILD_TESTS)