diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index ba5e7716f..a1ab95012 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -32,6 +32,7 @@ include(GNUInstallDirs) set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) +if(NOT WIN32) set(CUSTOM_FLAGS "\ -Wall \ -Wcast-align \ @@ -49,6 +50,7 @@ set(CUSTOM_FLAGS "\ -Wuninitialized \ -Wunused \ ") +endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG") @@ -59,8 +61,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG -DQT_DECLARAT set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 LinguistTools) find_package(Linphone REQUIRED) - -set(LIBS "${CMAKE_SOURCE_DIR}/../OUTPUT/desktop/lib64/liblinphone++.so") +find_package(LinphoneCxx REQUIRED) set(SOURCES src/app/App.cpp @@ -161,10 +162,12 @@ foreach (line ${QRC_RESOURCES_CONTENT}) endif () endforeach () -add_custom_target( - check_qml DEPENDS ${QML_SOURCES} - COMMAND "${CMAKE_SOURCE_DIR}/tools/check_qml_syntax" -) +if(NOT WIN32) + add_custom_target( + check_qml DEPENDS ${QML_SOURCES} + COMMAND "${CMAKE_SOURCE_DIR}/tools/check_qml_syntax" + ) +endif() # ------------------------------------------------------------------------------ # Init git hooks. @@ -190,9 +193,15 @@ qt5_add_resources(RESOURCES ${QRC_RESOURCES}) # Build. # Note: `update_translations` is provided by `languages/CMakeLists.txt`. -add_executable(${LINPHONE_EXEC} ${SOURCES} ${HEADERS} ${RESOURCES}) -add_dependencies(${LINPHONE_EXEC} update_translations) -add_dependencies(update_translations check_qml) +if(WIN32) + add_executable(${LINPHONE_EXEC} WIN32 ${SOURCES} ${HEADERS} ${RESOURCES}) +else() + add_executable(${LINPHONE_EXEC} ${SOURCES} ${HEADERS} ${RESOURCES}) +endif() + add_dependencies(${LINPHONE_EXEC} update_translations) +if(NOT WIN32) + add_dependencies(update_translations check_qml) +endif() target_include_directories(${LINPHONE_EXEC} SYSTEM PRIVATE "${LINPHONE_INCLUDE_DIRS}") foreach (package ${QT5_PACKAGES}) @@ -204,7 +213,7 @@ foreach (package ${QT5_PACKAGES}) endif() endforeach () -target_link_libraries(${LINPHONE_EXEC} ${LIBS} ${LINPHONE_LIBRARIES}) +target_link_libraries(${LINPHONE_EXEC} ${LINPHONE_LIBRARIES} ${LINPHONECXX_LIBRARIES}) install(TARGETS ${LINPHONE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index 5bf01d238..d29ed596a 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -1,9 +1,3 @@ -#include -#include -#include -#include -#include - #include "../components/calls/CallsListModel.hpp" #include "../components/camera/Camera.hpp" #include "../components/chat/ChatProxyModel.hpp" @@ -16,6 +10,12 @@ #include "App.hpp" +#include +#include +#include +#include +#include + #define LANGUAGES_PATH ":/languages/" #define WINDOW_ICON_PATH ":/assets/images/linphone.png" diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp index e28dfddec..e549d2eca 100644 --- a/linphone-desktop/src/app/App.hpp +++ b/linphone-desktop/src/app/App.hpp @@ -1,17 +1,17 @@ #ifndef APP_H_ #define APP_H_ +#include "../components/notifier/Notifier.hpp" +#include "AvatarProvider.hpp" +#include "DefaultTranslator.hpp" +#include "ThumbnailProvider.hpp" + #include #include #include #include #include -#include "../components/notifier/Notifier.hpp" -#include "AvatarProvider.hpp" -#include "DefaultTranslator.hpp" -#include "ThumbnailProvider.hpp" - // ============================================================================= class App : public QApplication { diff --git a/linphone-desktop/src/components/camera/Camera.cpp b/linphone-desktop/src/components/camera/Camera.cpp index b83c884bd..39c07d346 100644 --- a/linphone-desktop/src/components/camera/Camera.cpp +++ b/linphone-desktop/src/components/camera/Camera.cpp @@ -1,9 +1,9 @@ +#include "Camera.hpp" + #include #include #include -#include "Camera.hpp" - // ============================================================================= struct CameraStateBinder { diff --git a/linphone-desktop/src/components/camera/Camera.hpp b/linphone-desktop/src/components/camera/Camera.hpp index 666438ba0..dfc9e770f 100644 --- a/linphone-desktop/src/components/camera/Camera.hpp +++ b/linphone-desktop/src/components/camera/Camera.hpp @@ -1,11 +1,11 @@ #ifndef CAMERA_H_ #define CAMERA_H_ +#include "../call/CallModel.hpp" + #include #include -#include "../call/CallModel.hpp" - // ============================================================================= class Camera; diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.hpp b/linphone-desktop/src/components/chat/ChatProxyModel.hpp index aba11b114..a5bad46da 100644 --- a/linphone-desktop/src/components/chat/ChatProxyModel.hpp +++ b/linphone-desktop/src/components/chat/ChatProxyModel.hpp @@ -1,10 +1,10 @@ #ifndef CHAT_PROXY_MODEL_H_ #define CHAT_PROXY_MODEL_H_ -#include - #include "ChatModel.hpp" +#include + // ============================================================================= class ChatProxyModel : public QSortFilterProxyModel { diff --git a/linphone-desktop/src/components/contacts/ContactsListModel.hpp b/linphone-desktop/src/components/contacts/ContactsListModel.hpp index 047e2dbd1..70ad13ff6 100644 --- a/linphone-desktop/src/components/contacts/ContactsListModel.hpp +++ b/linphone-desktop/src/components/contacts/ContactsListModel.hpp @@ -2,10 +2,11 @@ #define CONTACTS_LIST_MODEL_H_ #include -#include #include "../contact/ContactModel.hpp" +#include + // ============================================================================= class ContactsListModel : public QAbstractListModel { diff --git a/linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp b/linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp index c43346f29..32cc08989 100644 --- a/linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp +++ b/linphone-desktop/src/components/contacts/ContactsListProxyModel.hpp @@ -1,10 +1,10 @@ #ifndef CONTACTS_LIST_PROXY_MODEL_H_ #define CONTACTS_LIST_PROXY_MODEL_H_ -#include - #include "../contact/ContactModel.hpp" +#include + // ============================================================================= class ContactsListModel; diff --git a/linphone-desktop/src/components/notifier/Notifier.cpp b/linphone-desktop/src/components/notifier/Notifier.cpp index 99ef0b681..b48f40986 100644 --- a/linphone-desktop/src/components/notifier/Notifier.cpp +++ b/linphone-desktop/src/components/notifier/Notifier.cpp @@ -1,12 +1,12 @@ +#include "../../app/App.hpp" + +#include "Notifier.hpp" + #include #include #include #include -#include "../../app/App.hpp" - -#include "Notifier.hpp" - // Notifications QML properties/methods. #define NOTIFICATION_SHOW_METHOD_NAME "show" diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp index 2a10510d3..473e24990 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.hpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.hpp @@ -1,10 +1,10 @@ #ifndef ACCOUNT_SETTINGS_MODEL_H_ #define ACCOUNT_SETTINGS_MODEL_H_ -#include - #include "../presence/Presence.hpp" +#include + // =================================================================== class AccountSettingsModel : public QObject { diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp index eeecd655f..2b5f908b9 100644 --- a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp +++ b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp @@ -1,12 +1,12 @@ #ifndef SIP_ADDRESSES_MODEL_H_ #define SIP_ADDRESSES_MODEL_H_ -#include - #include "../chat/ChatModel.hpp" #include "../contact/ContactModel.hpp" #include "../contact/ContactObserver.hpp" +#include + // ============================================================================= class CoreHandlers; diff --git a/linphone-desktop/src/components/smart-search-bar/SmartSearchBarModel.hpp b/linphone-desktop/src/components/smart-search-bar/SmartSearchBarModel.hpp index c64e46c09..e3cd82c78 100644 --- a/linphone-desktop/src/components/smart-search-bar/SmartSearchBarModel.hpp +++ b/linphone-desktop/src/components/smart-search-bar/SmartSearchBarModel.hpp @@ -1,10 +1,10 @@ #ifndef SMART_SEARCH_BAR_MODEL_H_ #define SMART_SEARCH_BAR_MODEL_H_ -#include - #include "../sip-addresses/SipAddressesModel.hpp" +#include + // ============================================================================= class SmartSearchBarModel : public QSortFilterProxyModel {