Browse Source

Merge pull request #10830 from jagannatharjun/fix-cmake

Fix CMake Windows compilation
adaptive-webui-19844
Mike Tzou 6 years ago committed by GitHub
parent
commit
34fbaf3325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      cmake/Modules/winconf-mingw.cmake
  2. 1
      cmake/Modules/winconf.cmake
  3. 2
      src/base/utils/misc.h

4
cmake/Modules/winconf-mingw.cmake

@ -1,7 +1,7 @@
if (STACKTRACE) if (STACKTRACE)
if ("${WINXXBITS}" NOT STREQUAL "Win64") if (NOT "${WINXXBITS}" STREQUAL "Win64")
add_compile_options(-fno-omit-frame-pointer) add_compile_options(-fno-omit-frame-pointer)
endif ("${WINXXBITS}" NOT STREQUAL "Win64") endif (NOT "${WINXXBITS}" STREQUAL "Win64")
link_libraries(libdbghelp -Wl,--export-all-symbols) link_libraries(libdbghelp -Wl,--export-all-symbols)
endif (STACKTRACE) endif (STACKTRACE)

1
cmake/Modules/winconf.cmake

@ -7,7 +7,6 @@ list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
set(LibtorrentRasterbar_USE_STATIC_LIBS True) set(LibtorrentRasterbar_USE_STATIC_LIBS True)
set(LibtorrentRasterbar_CUSTOM_DEFINITIONS set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
-DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021
-DBOOST_ASIO_SEPARATE_COMPILATION
-DBOOST_EXCEPTION_DISABLE -DBOOST_EXCEPTION_DISABLE
-DBOOST_SYSTEM_STATIC_LINK=1 -DBOOST_SYSTEM_STATIC_LINK=1
-DTORRENT_USE_OPENSSL -DTORRENT_USE_OPENSSL

2
src/base/utils/misc.h

@ -36,7 +36,7 @@
#include <Windows.h> #include <Windows.h>
#endif #endif
class QString; #include <QString>
enum class ShutdownDialogAction; enum class ShutdownDialogAction;

Loading…
Cancel
Save