Fix issues in build scripts
This commit is contained in:
parent
d03b8d8a74
commit
a979b5327c
|
@ -27,9 +27,10 @@ set(SRC_FILES
|
||||||
find_package(c++utilities 4.0.0 REQUIRED)
|
find_package(c++utilities 4.0.0 REQUIRED)
|
||||||
use_cpp_utilities()
|
use_cpp_utilities()
|
||||||
|
|
||||||
# find qtutilities (only header used)
|
# find qtutilities (only headers and CMake modules used)
|
||||||
find_package(qtutilities 5.0.0 REQUIRED)
|
find_package(qtutilities 5.0.0 REQUIRED)
|
||||||
include_directories(BEFORE SYSTEM ${QT_UTILITIES_INCLUDE_DIRS})
|
include_directories(BEFORE SYSTEM ${QT_UTILITIES_INCLUDE_DIRS})
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS})
|
||||||
|
|
||||||
# link also explicitely against the following Qt 5 modules
|
# link also explicitely against the following Qt 5 modules
|
||||||
list(APPEND ADDITIONAL_QT_MODULES Network)
|
list(APPEND ADDITIONAL_QT_MODULES Network)
|
||||||
|
|
|
@ -24,7 +24,7 @@ namespace Data {
|
||||||
|
|
||||||
struct SyncthingConnectionSettings;
|
struct SyncthingConnectionSettings;
|
||||||
|
|
||||||
QNetworkAccessManager &networkAccessManager();
|
QNetworkAccessManager LIB_SYNCTHING_CONNECTOR_EXPORT &networkAccessManager();
|
||||||
|
|
||||||
enum class SyncthingStatus
|
enum class SyncthingStatus
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,7 @@ private:
|
||||||
QString m_cmd;
|
QString m_cmd;
|
||||||
};
|
};
|
||||||
|
|
||||||
SyncthingProcess &syncthingProcess();
|
SyncthingProcess LIB_SYNCTHING_CONNECTOR_EXPORT &syncthingProcess();
|
||||||
|
|
||||||
} // namespace Data
|
} // namespace Data
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,10 @@ set(SRC_FILES
|
||||||
find_package(c++utilities 4.0.0 REQUIRED)
|
find_package(c++utilities 4.0.0 REQUIRED)
|
||||||
use_cpp_utilities()
|
use_cpp_utilities()
|
||||||
|
|
||||||
|
# find qtutilities (only CMake modules used)
|
||||||
|
find_package(qtutilities 5.0.0 REQUIRED)
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_MODULE_DIRS})
|
||||||
|
|
||||||
# find backend libraries
|
# find backend libraries
|
||||||
find_package(syncthingconnector ${META_APP_VERSION} REQUIRED)
|
find_package(syncthingconnector ${META_APP_VERSION} REQUIRED)
|
||||||
use_syncthingconnector()
|
use_syncthingconnector()
|
||||||
|
|
|
@ -118,7 +118,7 @@ int runApplication(int argc, const char *const *argv)
|
||||||
return res;
|
return res;
|
||||||
} else {
|
} else {
|
||||||
if(!TrayWidget::instances().empty() && showWebUi.isPresent()) {
|
if(!TrayWidget::instances().empty() && showWebUi.isPresent()) {
|
||||||
// if --webui is present don't create a new tray icon, just show the web UI one of the present ones
|
// if --webui is present don't create a new tray icon, just show the web UI of the present one
|
||||||
TrayWidget::instances().front()->showWebUi();
|
TrayWidget::instances().front()->showWebUi();
|
||||||
} else {
|
} else {
|
||||||
return initSyncthingTray(windowedArg.isPresent(), waitForTrayArg.isPresent());
|
return initSyncthingTray(windowedArg.isPresent(), waitForTrayArg.isPresent());
|
||||||
|
|
Loading…
Reference in New Issue