summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--src/application-lib/application-lib.pro1
-rw-r--r--src/common-lib/common-lib.pro1
-rw-r--r--src/crypto-lib/crypto-lib.pro1
-rw-r--r--src/dbus-lib/dbus-lib.pro1
-rw-r--r--src/installer-lib/installer-lib.pro1
-rw-r--r--src/intent-client-lib/intent-client-lib.pro1
-rw-r--r--src/intent-server-lib/intent-server-lib.pro1
-rw-r--r--src/launcher-lib/launcher-lib.pro1
-rw-r--r--src/main-lib/main-lib.pro1
-rw-r--r--src/manager-lib/manager-lib.pro1
-rw-r--r--src/monitor-lib/monitor-lib.pro1
-rw-r--r--src/notification-lib/notification-lib.pro1
-rw-r--r--src/package-lib/package-lib.pro1
-rw-r--r--src/shared-main-lib/shared-main-lib.pro1
-rw-r--r--src/window-lib/window-lib.pro1
16 files changed, 17 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf
index b2e906fe..3c17fadb 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -6,6 +6,8 @@ SOURCE_DIR=$$PWD
BUILD_DIR=$$shadowed($$PWD)
QMAKEFEATURES=$$SOURCE_DIR/qmake-features
+CMAKE_MODULE_TESTS = -
+
# Load the am-coverage feature in every pro file
# This makes sure we compile everything with coverage data
# when the coverage target gets executed
diff --git a/src/application-lib/application-lib.pro b/src/application-lib/application-lib.pro
index e17ce0fe..1f75472d 100644
--- a/src/application-lib/application-lib.pro
+++ b/src/application-lib/application-lib.pro
@@ -9,6 +9,7 @@ QT_FOR_PRIVATE *= \
appman_common-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
HEADERS += \
applicationinfo.h \
diff --git a/src/common-lib/common-lib.pro b/src/common-lib/common-lib.pro
index 2ee3a8eb..f3f99251 100644
--- a/src/common-lib/common-lib.pro
+++ b/src/common-lib/common-lib.pro
@@ -15,6 +15,7 @@ versionAtLeast(QT.geniviextras.VERSION, 1.1.0) {
}
CONFIG *= static internal_module
+CONFIG -= create_cmake
include($$SOURCE_DIR/3rdparty/libyaml.pri)
contains(DEFINES, "AM_USE_LIBBACKTRACE"):include($$SOURCE_DIR/3rdparty/libbacktrace.pri)
diff --git a/src/crypto-lib/crypto-lib.pro b/src/crypto-lib/crypto-lib.pro
index 375d1091..3f246568 100644
--- a/src/crypto-lib/crypto-lib.pro
+++ b/src/crypto-lib/crypto-lib.pro
@@ -8,6 +8,7 @@ QT = core
QT_FOR_PRIVATE *= appman_common-private
CONFIG *= static internal_module
+CONFIG -= create_cmake
SOURCES += \
cryptography.cpp \
diff --git a/src/dbus-lib/dbus-lib.pro b/src/dbus-lib/dbus-lib.pro
index cc39bf5b..567fb0f3 100644
--- a/src/dbus-lib/dbus-lib.pro
+++ b/src/dbus-lib/dbus-lib.pro
@@ -10,6 +10,7 @@ QT_FOR_PRIVATE *= \
appman_manager-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
CONFIG = dbus-adaptors-xml $$CONFIG
HEADERS += \
diff --git a/src/installer-lib/installer-lib.pro b/src/installer-lib/installer-lib.pro
index 0ebda484..c61ad7fd 100644
--- a/src/installer-lib/installer-lib.pro
+++ b/src/installer-lib/installer-lib.pro
@@ -13,6 +13,7 @@ QT_FOR_PRIVATE *= \
appman_manager-private
CONFIG *= static internal_module
+CONFIG -= create_cmake
include($$SOURCE_DIR/3rdparty/libarchive.pri)
include($$SOURCE_DIR/3rdparty/libz.pri)
diff --git a/src/intent-client-lib/intent-client-lib.pro b/src/intent-client-lib/intent-client-lib.pro
index e1dcabb4..dc495719 100644
--- a/src/intent-client-lib/intent-client-lib.pro
+++ b/src/intent-client-lib/intent-client-lib.pro
@@ -9,6 +9,7 @@ QT_FOR_PRIVATE *= \
appman_common-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
HEADERS += \
intenthandler.h \
diff --git a/src/intent-server-lib/intent-server-lib.pro b/src/intent-server-lib/intent-server-lib.pro
index 5dadab01..19ebf29c 100644
--- a/src/intent-server-lib/intent-server-lib.pro
+++ b/src/intent-server-lib/intent-server-lib.pro
@@ -9,6 +9,7 @@ QT_FOR_PRIVATE *= \
appman_common-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
HEADERS += \
intent.h \
diff --git a/src/launcher-lib/launcher-lib.pro b/src/launcher-lib/launcher-lib.pro
index f0f8dcb8..df00d155 100644
--- a/src/launcher-lib/launcher-lib.pro
+++ b/src/launcher-lib/launcher-lib.pro
@@ -15,6 +15,7 @@ QT_FOR_PRIVATE *= \
appman_intent_client-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
DBUS_INTERFACES += ../dbus-lib/io.qt.applicationmanager.intentinterface.xml
diff --git a/src/main-lib/main-lib.pro b/src/main-lib/main-lib.pro
index 826caf86..73a972c3 100644
--- a/src/main-lib/main-lib.pro
+++ b/src/main-lib/main-lib.pro
@@ -24,6 +24,7 @@ QT *= \
!disable-external-dbus-interfaces:qtHaveModule(dbus):QT *= dbus appman_dbus-private
CONFIG *= static internal_module
+CONFIG -= create_cmake
win32:LIBS += -luser32
diff --git a/src/manager-lib/manager-lib.pro b/src/manager-lib/manager-lib.pro
index 7e357c28..170792bd 100644
--- a/src/manager-lib/manager-lib.pro
+++ b/src/manager-lib/manager-lib.pro
@@ -16,6 +16,7 @@ QT_FOR_PRIVATE *= \
appman_monitor-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
multi-process {
QT *= dbus
diff --git a/src/monitor-lib/monitor-lib.pro b/src/monitor-lib/monitor-lib.pro
index dc8fb5ae..7de7329e 100644
--- a/src/monitor-lib/monitor-lib.pro
+++ b/src/monitor-lib/monitor-lib.pro
@@ -11,6 +11,7 @@ QT_FOR_PRIVATE *= \
appman_common-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
linux:HEADERS += \
sysfsreader.h \
diff --git a/src/notification-lib/notification-lib.pro b/src/notification-lib/notification-lib.pro
index 1092fba5..eb7d1edc 100644
--- a/src/notification-lib/notification-lib.pro
+++ b/src/notification-lib/notification-lib.pro
@@ -9,6 +9,7 @@ qtHaveModule(qml):QT *= qml
QT_FOR_PRIVATE *= appman_common-private
CONFIG *= static internal_module
+CONFIG -= create_cmake
HEADERS += \
notification.h \
diff --git a/src/package-lib/package-lib.pro b/src/package-lib/package-lib.pro
index 6e73504f..d38aa343 100644
--- a/src/package-lib/package-lib.pro
+++ b/src/package-lib/package-lib.pro
@@ -11,6 +11,7 @@ QT_FOR_PRIVATE *= \
appman_application-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
include($$SOURCE_DIR/3rdparty/libarchive.pri)
include($$SOURCE_DIR/3rdparty/libz.pri)
diff --git a/src/shared-main-lib/shared-main-lib.pro b/src/shared-main-lib/shared-main-lib.pro
index 607dd701..f71ce690 100644
--- a/src/shared-main-lib/shared-main-lib.pro
+++ b/src/shared-main-lib/shared-main-lib.pro
@@ -11,6 +11,7 @@ QT *= \
appman_monitor-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
HEADERS += \
sharedmain.h \
diff --git a/src/window-lib/window-lib.pro b/src/window-lib/window-lib.pro
index e1e84db4..a5a43177 100644
--- a/src/window-lib/window-lib.pro
+++ b/src/window-lib/window-lib.pro
@@ -12,6 +12,7 @@ QT_FOR_PRIVATE *= \
appman_manager-private \
CONFIG *= static internal_module
+CONFIG -= create_cmake
multi-process:!headless {
HEADERS += \
View Lorry Controller Status