Add recursive option to qmake (PREFIX doesn't propagate without it)

parallaxinc · Dec 2, 2015 · c490ad0 · c490ad0
1 parent 5d50d01
commit c490ad0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 29 deletions.
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -3,7 +3,7 @@ set -e
 
 PROJECTNAME=propellermanager-$TRAVIS_TAG-$TRAVIS_OS_NAME
 
-qmake PREFIX=$PROJECTNAME
+qmake PREFIX=$PROJECTNAME -r
 make -j4
 make install
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,15 +7,15 @@ environment:
 configuration: Release
 
 install:
-- set PATH=%PATH%;%QTDIR%\bin;%MINGW%\bin;C:\Qt\Tools\QtCreator\bin;
-- set PROJECTNAME=propellermanager-%APPVEYOR_REPO_TAG_NAME%-win
-- qmake -v
+    - set PATH=%PATH%;%QTDIR%\bin;%MINGW%\bin;C:\Qt\Tools\QtCreator\bin;
+    - set PROJECTNAME=propellermanager-%APPVEYOR_REPO_TAG_NAME%-win
+    - qmake -v
 
 build_script:
-- qmake PREFIX=%PROJECTNAME%
-- mingw32-make
-- mingw32-make install
-- jar -cMf %PROJECTNAME%.zip %PROJECTNAME%
+    - qmake PREFIX=%PROJECTNAME% -r
+    - mingw32-make
+    - mingw32-make install
+    - jar -cMf %PROJECTNAME%.zip %PROJECTNAME%
 
 artifacts:
   - path: propellermanager-*.zip

diff --git a/propellermanager.pro b/propellermanager.pro
@@ -15,30 +15,16 @@ docs.commands = cd doc && bash process.sh
 QMAKE_EXTRA_TARGETS += docs
 QMAKE_CLEAN += doc/html/* doc/doxygen_sqlite3.db
 
-
-OTHER_FILES += \
-    $$PWD/include/PropellerImage \
-    $$PWD/include/PropellerSession \
-    $$PWD/include/PropellerManager \
-    $$PWD/include/PropellerLoader \
-    $$PWD/include/PropellerTerminal \
-
 isEmpty(PREFIX) {
     PREFIX = /usr/local
 }
 
-libs.files      = lib/*
-bins.files      = bin/*
-includes.files  = include/*
-
-win32 {
-    libs.path       = $$PREFIX
-    bins.path       = $$PREFIX
-    includes.path   = $$PREFIX
-} else {
-    libs.path       = $$PREFIX/lib
-    bins.path       = $$PREFIX/bin
-    includes.path   = $$PREFIX/include
-}
+libs.path       = $$PREFIX/lib
+bins.path       = $$PREFIX/bin
+includes.path   = $$PREFIX/include
+
+libs.files      = $$PWD/lib/*
+bins.files      = $$PWD/bin/*
+includes.files  = $$PWD/include/*
 
 INSTALLS += libs includes bins