Restructurization of project

devray · Jan 24, 2012 · e21f281 · e21f281
1 parent 6d12159
commit e21f281
Show file tree

Hide file tree

Showing 18 changed files with 78 additions and 24 deletions.
diff --git a/app/app.pro b/app/app.pro
@@ -0,0 +1,21 @@
+# -------------------------------------------------
+# Project created by QtCreator 2012-01-04T21:23:34
+# -------------------------------------------------
+QT -= core \
+    gui
+
+TARGET = ../bin/mbica
+
+TEMPLATE = app 
+CONFIG += console
+
+SOURCES += \
+    main.cpp \
+
+LIBS += -lmbica -larmadillo
+
+INCLUDEPATH += ../include
+QMAKE_LIBDIR += ../lib
+
+DEFINES += ARMA_USE_LAPACK \
+    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/main.cpp → app/main.cpp b/main.cpp → app/main.cpp
diff --git a/icaseparator.h → include/icaseparator.h b/icaseparator.h → include/icaseparator.h
diff --git a/mbica.h → include/mbica.h b/mbica.h → include/mbica.h
diff --git a/nonlinearities.h → include/nonlinearities.h b/nonlinearities.h → include/nonlinearities.h
diff --git a/policies.h → include/policies.h b/policies.h → include/policies.h
diff --git a/utils.h → include/utils.h b/utils.h → include/utils.h
diff --git a/mbica.pro b/mbica.pro
@@ -1,26 +1,10 @@
-# -------------------------------------------------
-# Project created by QtCreator 2012-01-04T21:23:34
-# -------------------------------------------------
-QT -= core \
-    gui
-TARGET = mbica
 
-# TEMPLATE = lib
-# CONFIG += staticlib
-SOURCES += \
-    icaseparator.cpp \
-    nonlinearities.cpp \
-    main.cpp \
-    utils.cpp \
-    policies.cpp
-    #tests/pca_test.cpp \
-    #tests/whitening_test.cpp
-HEADERS += mbica.h \
-    icaseparator.h \
-    nonlinearities.h \
-    utils.h \
-    policies.h
-LIBS += -larmadillo -lboost_unit_test_framework
+TEMPLATE = subdirs
+SUBDIRS = library \
+		app \
+                tests
+
+library.subdir = source
+app.depends = library
+tests.depends = library
 
-DEFINES += ARMA_USE_LAPACK \
-    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/icaseparator.cpp → source/icaseparator.cpp b/icaseparator.cpp → source/icaseparator.cpp
diff --git a/nonlinearities.cpp → source/nonlinearities.cpp b/nonlinearities.cpp → source/nonlinearities.cpp
diff --git a/policies.cpp → source/policies.cpp b/policies.cpp → source/policies.cpp
diff --git a/source/source.pro b/source/source.pro
@@ -0,0 +1,27 @@
+# -------------------------------------------------
+# Project created by QtCreator 2012-01-04T21:23:34
+# -------------------------------------------------
+QT -= core \
+    gui
+
+TARGET = ../lib/mbica
+
+TEMPLATE = lib
+CONFIG += staticlib
+
+SOURCES += \
+    icaseparator.cpp \
+    nonlinearities.cpp \
+    utils.cpp \
+    policies.cpp
+HEADERS += ../include/mbica.h \
+    ../include/icaseparator.h \
+    ../include/nonlinearities.h \
+    ../include/utils.h \
+    ../include/policies.h
+
+INCLUDEPATH += ../include
+LIBS += -larmadillo -lboost_unit_test_framework
+
+DEFINES += ARMA_USE_LAPACK \
+    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/utils.cpp → source/utils.cpp b/utils.cpp → source/utils.cpp
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -0,0 +1,22 @@
+# -------------------------------------------------
+# Project created by QtCreator 2012-01-04T21:23:34
+# -------------------------------------------------
+QT -= core \
+    gui
+
+TARGET = unit_tests
+
+TEMPLATE = app
+CONFIG += console
+
+SOURCES += \
+    pca_test.cpp \
+    whitening_test.cpp
+
+LIBS += -lmbica -larmadillo -lboost_unit_test_framework
+
+INCLUDEPATH += ../include
+QMAKE_LIBDIR += ../lib
+
+DEFINES += ARMA_USE_LAPACK \
+    BOOST_PARAMETER_MAX_ARITY=7
diff --git a/epoc_reader/SConstruct → tools/epoc_reader/SConstruct b/epoc_reader/SConstruct → tools/epoc_reader/SConstruct
diff --git a/epoc_reader/main.cpp → tools/epoc_reader/main.cpp b/epoc_reader/main.cpp → tools/epoc_reader/main.cpp
diff --git a/filtering_tool/SConstruct → tools/filtering_tool/SConstruct b/filtering_tool/SConstruct → tools/filtering_tool/SConstruct
diff --git a/filtering_tool/main.cpp → tools/filtering_tool/main.cpp b/filtering_tool/main.cpp → tools/filtering_tool/main.cpp