Merge pull request #6 from vetlewi/master

Minor tweeks
oslocyclotronlab · Jan 13, 2016 · afb5ebb · afb5ebb
2 parents 858cfe8 + 4e9ff59
commit afb5ebb
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,8 +25,8 @@ before_install:
 - scripts/travis_osx.sh
 script:
 - scripts/travis_qmake.sh
-- make
-- ./tests/tests
+- make -j2
+- ./build/tests/tests
 
 before_deploy:
 - scripts/travis_deploy.sh
@@ -35,7 +35,7 @@ deploy:
   provider: releases
   api_key:
     secure: UoWphEeoyOWf+tbeW75g1VfQcxQ+1VOUKUxus7xJ5uIuRShQqLm7UERn7N6hhFr5e4ccQk18zXs7t27kwYqZRDBH6cHwR8ns9EcXuZS4L9FQ20HS4+dqRxsUh2sTyhOx6jfY0PLOc7NvyBiVkcAjNMrybcekHzlrtNO8Gh9g08G1wi8j9dgJ4YDfRtppVkZn8MHcSmfKE4y+5rSun/Ztl91ofDW4Zm7sRct8XRJb+4woFajsPBKd+WhzcqYVohzvuwZFJNZCGofQUo0H6x82aQK63MsylFo2YonajNMeOkeBOYlxD4ZyHrr9nJW03+HtqEeYhcQi00/v8bGgcl79Ir5HbYrbqR9FFFw6HA1IQKNo+2A3t3OllPvuuHhiidXeriA8aDgPzMKJwzgTX4MSViM1JyiZC32W0oFMBHeMN8RGZoGWyYO7f13BllJxgy3GDJXUyNDgYwkH7J+igYz/kZElhZiFpiirl2wts0koqd4NSDDcC3A0iPt0Y3P+NZWnYIojxzA7LxrIXdb0wdIAVkknIMjV1wLFl7e7mdMMmlCAQQYMvNKhDhIiCWLVk2kRyqEYI4ofbAnrJ2ACCAWu5Vml/s4bwposjbP5tJ2zcvgxxYS+QH2OncnQfb5I8V7hClkgWLZ5arjxWa9+Y+8MboBDVNEk5dH3KIy4Hs4WW1M=
-  file: app/Qkinz.dmg
+  file: build/app/Qkinz.dmg
   skip_cleanup: true
   on:
     condition: "$TRAVIS_OS_NAME = osx" 

diff --git a/Qkinz.pro b/Qkinz.pro
@@ -1,10 +1,18 @@
 TEMPLATE = subdirs
-CONFIG += ordered
+#	CONFIG += ordered
 
 SUBDIRS = \
     src \
     app \
     tests
 
 app.depends = src
-tests.depends = src
+tests.depends = src
+
+QMAKE_DISTCLEAN += -r
+QMAKE_DISTCLEAN +=  $$PWD/Makefile \
+					$$PWD/src/Makefile \
+					$$PWD/app/Makefile \
+					$$PWD/tests/Makefile \
+                    $$PWD/*.pro.* \
+                    $$PWD/build
diff --git a/app/app.pro b/app/app.pro
@@ -7,6 +7,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport webkitwidgets
 TARGET = Qkinz
 TEMPLATE = app
 
+DESTDIR = $$BUILDDIR/app
+OBJECTS_DIR = $$BUILDDIR/app
+MOC_DIR = $$BUILDDIR/app
+RCC_DIR = $$BUILDDIR/app
+UI_DIR = $$BUILDDIR/app
+
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
     QMAKE_CXXFLAGS += -std=c++11 #-O3
@@ -17,4 +23,21 @@ macx {
 
 SOURCES += main.cpp
 
-LIBS += -L../src -lkinzgui
+LIBS += -L$$BUILDDIR/src -lkinzgui
+
+linux {
+    binfile.files += $$BUILDDIR/app/$$TARGET
+    binfile.path += /usr/bin/
+    icon.files += $$PWD/../Qkinz.png
+    icon.path += /usr/share/$$TARGET
+    desktop.path = /usr/share/applications/
+    desktop.files = $$PWD/../Qkinz.desktop
+    INSTALLS += binfile
+    INSTALLS += icon
+    INSTALLS += desktop
+}
+
+QMAKE_CLEAN += 	$$BUILDDIR/app/*.o \
+				$$BUILDDIR/app/moc_* \
+				$$BUILDDIR/app/qrc_* \
+				$$BUILDDIR/app/ui_*
diff --git a/defaults.pri b/defaults.pri
@@ -6,4 +6,6 @@ INCLUDEPATH += $$PWD/src \
 		$$PWD/src/support/include \
 		$$PWD/src/tables/include
 
-SRC_DIR = $$PWD
+SRC_DIR = $$PWD
+
+BUILDDIR = $$PWD/build
diff --git a/src/src.pro b/src/src.pro
@@ -13,14 +13,11 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 
-#unix {
-#    BUILDDIR = $$PWD/../build
-#    DESTDIR = $$BUILDDIR
-#    OBJECTS_DIR = $$BUILDDIR
-#    MOC_DIR = $$BUILDDIR
-#    RCC_DIR = $$BUILDDIR
-#    UI_DIR = $$BUILDDIR
-#}
+DESTDIR = $$BUILDDIR/src
+OBJECTS_DIR = $$BUILDDIR/src/objects
+MOC_DIR = $$BUILDDIR/src/moc
+RCC_DIR = $$BUILDDIR/src/rcc
+UI_DIR = $$BUILDDIR/src/ui
 
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
@@ -110,21 +107,7 @@ FORMS    += gui/forms/mainwindow.ui \
 
 RESOURCES += ../resources/resorces.qrc
 
-unix {
-    binfile.files += $$BUILDDIR/$$TARGET
-    binfile.path += /usr/bin/
-    icon.files += $$PWD/Qkinz.png
-    icon.path += /usr/share/$$TARGET
-    desktop.path = /usr/share/applications/
-    desktop.files = $$PWD/Qkinz.desktop
-    INSTALLS += binfile
-    INSTALLS += icon
-    INSTALLS += desktop
-}
-
-QMAKE_CLEAN +=  $$BUILDDIR/*.o \
-                $$BUILDDIR/moc_* \
-                $$BUILDDIR/ui_*
-
-QMAKE_DISTCLEAN +=  $$PWD/Makefile \
-                    $$PWD/*.pro.*
+QMAKE_CLEAN +=  $$BUILDDIR/src/objects/*.o \
+                $$BUILDDIR/src/moc/moc_* \
+                $$BUILDDIR/src/rcc/qrc_* \
+                $$BUILDDIR/src/ui/ui_*
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -3,6 +3,12 @@ include(../defaults.pri)
 CONFIG += console
 CONFIG -= app_bundle
 
+DESTDIR = $$BUILDDIR/tests
+OBJECTS_DIR = $$BUILDDIR/tests
+MOC_DIR = $$BUILDDIR/tests
+RCC_DIR = $$BUILDDIR/tests
+UI_DIR = $$BUILDDIR/tests
+
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
     QMAKE_CXXFLAGS += -std=c++11 #-O3
@@ -12,7 +18,11 @@ macx {
 
 SOURCES += main.cpp
 
-LIBS += -L../src -lkinzgui
+LIBS += -L$$BUILDDIR/src -lkinzgui
+
+HEADERS += catch.hpp
 
-HEADERS += \
-    catch.hpp
+QMAKE_CLEAN += 	$$BUILDDIR/tests/*.o \
+				$$BUILDDIR/tests/moc_* \
+				$$BUILDDIR/tests/qrc_* \
+				$$BUILDDIR/tests/ui_*