Other: fix for windows build and default to MSVC toolchain on Windows.

This commit is contained in:
Xavier Michelon 2022-07-27 06:50:25 +02:00 committed by Jakub
parent 2e4128dcfe
commit 033139677b
3 changed files with 8 additions and 4 deletions

View File

@ -42,7 +42,7 @@ if (APPLE)
endif()
if (WIN32)
set(VCPKG_TARGET_TRIPLET x64-mingw-static)
set(VCPKG_TARGET_TRIPLET x64-windows)
endif()
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain")

View File

@ -42,10 +42,7 @@ public slots:
void run() override; ///< Run the reader.
signals:
#pragma clang diagnostic push
#pragma ide diagnostic ignored "NotImplementedFunctions"
void eventReceived(QString eventString); ///< signal for events.
#pragma clang diagnostic pop
};

View File

@ -27,4 +27,11 @@
#include <AppController.h>
#if defined(Q_OS_WIN32) && defined(ERROR)
// The folks at Microsoft have decided that it was OK to `#define ERROR 0` in wingdi.h. It is not OK, because
// any occurrence of ERROR, even scoped, will be substituted. For instance Log::Level::ERROR (case imposed by gRPC).
#undef ERROR
#endif
#endif // BRIDGE_GUI_PCH_H