jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve CMake - sync documentation with #4627 and fixup #4547

Browse Source
This commit is contained in:
FranciscoPombal
2020-05-12 17:20:02 +01:00
committed by Arvid Norberg
parent 2697a8ac74
commit 063bb0bbaf
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -636,7 +636,7 @@ if(OPENSSL_FOUND)
# TODO: needed until https://gitlab.kitware.com/cmake/cmake/issues/19263 is fixed # TODO: needed until https://gitlab.kitware.com/cmake/cmake/issues/19263 is fixed
if(WIN32 AND OPENSSL_USE_STATIC_LIBS) if(WIN32 AND OPENSSL_USE_STATIC_LIBS)
target_link_libraries(OpenSSL::Crypto INTERFACE crypt32) target_link_libraries(torrent-rasterbar PRIVATE crypt32)
endif() endif()
target_link_libraries(torrent-rasterbar PUBLIC OpenSSL::SSL) target_link_libraries(torrent-rasterbar PUBLIC OpenSSL::SSL)

6
docs/building.rst
View File

@@ -484,12 +484,6 @@ Other build options are:
Options are set on the ``cmake`` command line with the ``-D`` option or later on using ``ccmake`` or ``cmake-gui`` applications. ``cmake`` run outputs a summary of all available options and their current values. Options are set on the ``cmake`` command line with the ``-D`` option or later on using ``ccmake`` or ``cmake-gui`` applications. ``cmake`` run outputs a summary of all available options and their current values.
.. note::
If you are linking statically against OpenSSL on Windows and not using ``-Dstatic_runtime=ON``,
you should additionally use the option ``-DOPENSSL_USE_STATIC_LIBS=ON``.
If you use ``-Dstatic_runtime=ON``, ``-DOPENSSL_USE_STATIC_LIBS=ON`` is implied.
Step 2: Building libtorrent Step 2: Building libtorrent
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~