Skip to content

Commit

Permalink
Merge pull request #12 from rburchell/master
Browse files Browse the repository at this point in the history
Decrease build time
  • Loading branch information
rburchell committed Jun 29, 2013
2 parents 6027c03 + 89fa993 commit f1f4f89
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 24 deletions.
2 changes: 0 additions & 2 deletions commhistory-daemon.pro
Expand Up @@ -22,8 +22,6 @@

TEMPLATE = subdirs
SUBDIRS = src data tests translations
CONFIG += ordered


# End of File

22 changes: 1 addition & 21 deletions common-installs-config.pri
Expand Up @@ -31,13 +31,8 @@
INSTALL_PREFIX = /usr # default installation prefix

# default prefix can be overriden by defining PREFIX when running qmake
isEmpty( PREFIX ) {
message("====")
message("==== NOTE: To override the installation path run: `qmake PREFIX=/custom/path'")
message("==== (current installation path is `$${INSTALL_PREFIX}')")
} else {
!isEmpty( PREFIX ) {
INSTALL_PREFIX = $${PREFIX}
message("====")
message("==== install prefix set to `$${INSTALL_PREFIX}'")
}

Expand All @@ -48,8 +43,6 @@ isEmpty( PREFIX ) {
contains( TEMPLATE, app ) {
target.path = $${INSTALL_PREFIX}/bin
INSTALLS += target
message("====")
message("==== INSTALLS += target")
}

#-----------------------------------------------------------------------------
Expand All @@ -59,23 +52,15 @@ contains( TEMPLATE, lib ) {

target.path = $${INSTALL_PREFIX}/lib
INSTALLS += target
message("====")
message("==== INSTALLS += target")


#-------------------------------------------------------------------------
# target for pkg-config file
#-------------------------------------------------------------------------
CONFIG *= create_prl create_pc
message("====")
message("==== Generating new pkg-config metadata file: $${TARGET}.pc")
message("==== NOTE: Remember to verify the `prefix' path in your .pc file!")
message("==== (it should be $${INSTALL_PREFIX})")
pkgconfig.files = $${TARGET}.pc
pkgconfig.path = $${INSTALL_PREFIX}/lib/pkgconfig
INSTALLS += pkgconfig
message("====")
message("==== INSTALLS += pkgconfig")

# reset the .pc file's `prefix' variable
include( tools/fix-pc-prefix.pri )
Expand All @@ -88,11 +73,6 @@ contains( TEMPLATE, lib ) {
!isEmpty( headers.files ) {
headers.path = $${INSTALL_PREFIX}/include/$${TARGET}
INSTALLS += headers
message("====")
message("==== INSTALLS += headers")
} else {
message("====")
message("==== NOTE: Remember to add your API headers into `headers.files' for installation!")
}


Expand Down
1 change: 0 additions & 1 deletion tests/tests.pro
Expand Up @@ -27,7 +27,6 @@ SUBDIRS = ut_notificationmanager \
ut_textchannellistener \
ut_streamchannellistener \
ut_messagereviver
CONFIG += ordered

# make sure the destination path exists
!system( mkdir -p $${OUT_PWD}/bin ) : \
Expand Down

0 comments on commit f1f4f89

Please sign in to comment.