Build system now allow building plugins out of src/plugins directory

remotes/origin/falkon
nowrep 14 years ago
parent abdcc5bfab
commit 0d4078f005
  1. 1
      .gitignore
  2. 3
      QupZilla.pro
  3. 21
      src/plugins/plugins.pro
  4. 3
      src/src.pro

1
.gitignore vendored

@ -7,6 +7,7 @@ DEBIAN
*.a
*.orig
*.qm
*.o
!qt_*.qm
headers*.tar.gz
license_template

@ -14,4 +14,5 @@ lessThan(QT_VERSION, 4.7) {
mac|unix: system(test -d bin/plugins || mkdir bin/plugins)
TEMPLATE = subdirs
SUBDIRS = src
SUBDIRS = src/lib src/main src/plugins
CONFIG += ordered

@ -1,5 +1,22 @@
TEMPLATE = subdirs
SUBDIRS = MouseGestures AccessKeysNavigation
defineTest(addSubdir) {
for(subdir, 1) {
entries = $$files($$subdir/*)
for(entry, entries) {
fullPath = $$replace(entry, ;,"")
name = $$replace(fullPath, $$re_escape("$$subdir/"), "")
exists($$fullPath/*.pro): SUBDIRS += $$fullPath
}
}
export (SUBDIRS)
}
addSubdir($$PWD)
outOfDirPlugins = $$(QUPZILLA_PLUGINS_SRCDIR)
!equals(outOfDirPlugins, "") : addSubdir($$(QUPZILLA_PLUGINS_SRCDIR))
# TestPlugin only in debug build
CONFIG(debug, debug|release): SUBDIRS += TestPlugin
!CONFIG(debug, debug|release): SUBDIRS -= $$PWD/TestPlugin

@ -1,3 +0,0 @@
TEMPLATE = subdirs
SUBDIRS = lib main plugins
CONFIG += ordered
Loading…
Cancel
Save