Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'mer-select-plugins' into 'master'
[buteo-sync-plugins-social] Allow building only parts of the project

See merge request mer-core/buteo-sync-plugins-social!67
  • Loading branch information
pvuorela committed Nov 16, 2020
2 parents 751f3f2 + c74838d commit db60b48
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 15 deletions.
11 changes: 10 additions & 1 deletion rpm/sociald.spec
Expand Up @@ -631,7 +631,16 @@ Requires: qt5-qtdeclarative-import-qttest
%setup -q -n %{name}-%{version}

%build
%qmake5 "DEFINES+=OUT_OF_PROCESS_PLUGIN"
%qmake5 "DEFINES+=OUT_OF_PROCESS_PLUGIN" \
"CONFIG+=dropbox" \
"CONFIG+=facebook" \
"CONFIG+=google" \
"CONFIG+=onedrive" \
"CONFIG+=twitter" \
"CONFIG+=vk" \
"CONFIG+=knowncontacts" \
"CONFIG+=calendar" \
"CONFIG+=build-tests"
make %{_smp_mflags}

%pre
Expand Down
8 changes: 6 additions & 2 deletions sociald.pro
@@ -1,5 +1,9 @@
TEMPLATE = subdirs
SUBDIRS = src tests
tests.depends = src
SUBDIRS = src

CONFIG(build-tests) {
SUBDIRS += tests
tests.depends = src
}

OTHER_FILES += rpm/sociald.spec
3 changes: 2 additions & 1 deletion src/google/google.pro
@@ -1,5 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = \
$$PWD/google-calendars \
$$PWD/google-contacts \
$$PWD/google-signon

CONFIG(calendar): SUBDIRS += $$PWD/google-calendars
17 changes: 9 additions & 8 deletions src/src.pro
@@ -1,10 +1,11 @@
TEMPLATE = subdirs
SUBDIRS = \
sociald \
google \
facebook \
twitter \
onedrive \
dropbox \
vk \
knowncontacts
sociald

CONFIG(google): SUBDIRS += google
CONFIG(facebook): SUBDIRS += facebook
CONFIG(twitter): SUBDIRS += twitter
CONFIG(onedrive): SUBDIRS += onedrive
CONFIG(dropbox): SUBDIRS += dropbox
CONFIG(vk): SUBDIRS += vk
CONFIG(knowncontacts): SUBDIRS += knowncontacts
7 changes: 4 additions & 3 deletions tests/tests.pro
@@ -1,7 +1,8 @@
TEMPLATE = subdirs

SUBDIRS = \
tst_google \
tst_twitter
SUBDIRS =

CONFIG(google): SUBDIRS += tst_google
CONFIG(twitter): SUBDIRS += tst_twitter

QMAKE_EXTRA_TARGETS += check

0 comments on commit db60b48

Please sign in to comment.