From ece70daaa5042a317a4a6a86bb47fe5dbf90920a Mon Sep 17 00:00:00 2001 From: Prince Gupta Date: Fri, 21 Jun 2019 18:05:19 +0530 Subject: [PATCH] Fix CMake Windows compilation --- cmake/Modules/winconf-mingw.cmake | 4 ++-- cmake/Modules/winconf.cmake | 1 - src/base/utils/misc.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/winconf-mingw.cmake b/cmake/Modules/winconf-mingw.cmake index 70d7ac00a..755742257 100644 --- a/cmake/Modules/winconf-mingw.cmake +++ b/cmake/Modules/winconf-mingw.cmake @@ -1,7 +1,7 @@ if (STACKTRACE) - if ("${WINXXBITS}" NOT STREQUAL "Win64") + if (NOT "${WINXXBITS}" STREQUAL "Win64") add_compile_options(-fno-omit-frame-pointer) - endif ("${WINXXBITS}" NOT STREQUAL "Win64") + endif (NOT "${WINXXBITS}" STREQUAL "Win64") link_libraries(libdbghelp -Wl,--export-all-symbols) endif (STACKTRACE) diff --git a/cmake/Modules/winconf.cmake b/cmake/Modules/winconf.cmake index 6976657f8..7e178c123 100644 --- a/cmake/Modules/winconf.cmake +++ b/cmake/Modules/winconf.cmake @@ -7,7 +7,6 @@ list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}") set(LibtorrentRasterbar_USE_STATIC_LIBS True) set(LibtorrentRasterbar_CUSTOM_DEFINITIONS -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 - -DBOOST_ASIO_SEPARATE_COMPILATION -DBOOST_EXCEPTION_DISABLE -DBOOST_SYSTEM_STATIC_LINK=1 -DTORRENT_USE_OPENSSL diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index 31e6fb3a7..4aa57c8ca 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -36,7 +36,7 @@ #include #endif -class QString; +#include enum class ShutdownDialogAction;