Other: fix for windows build and default to MSVC toolchain on Windows.
This commit is contained in:
parent
2e4128dcfe
commit
033139677b
|
@ -42,7 +42,7 @@ if (APPLE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(VCPKG_TARGET_TRIPLET x64-mingw-static)
|
set(VCPKG_TARGET_TRIPLET x64-windows)
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain")
|
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain")
|
||||||
|
|
||||||
|
|
|
@ -42,10 +42,7 @@ public slots:
|
||||||
void run() override; ///< Run the reader.
|
void run() override; ///< Run the reader.
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
#pragma clang diagnostic push
|
|
||||||
#pragma ide diagnostic ignored "NotImplementedFunctions"
|
|
||||||
void eventReceived(QString eventString); ///< signal for events.
|
void eventReceived(QString eventString); ///< signal for events.
|
||||||
#pragma clang diagnostic pop
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,4 +27,11 @@
|
||||||
#include <AppController.h>
|
#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
|
#endif // BRIDGE_GUI_PCH_H
|
||||||
|
|
Loading…
Reference in New Issue