chatterino2
Code Issues

Use CMakeDeps and CMakeToolchain as Generators on Conan (#4335)

Browse Source 
* deps(conan): use `CMakeDeps` as generator

* chore: add changelog entry

* deps(conan): add `CMakeToolchain` generator

* fix: use generated toolchain file

* docs: mention toolchain as well

* fix: spelling

* fix: formatting

* revert: use nmake

* docs: fix documentation
This commit is contained in:
nerix
2023-01-29 14:10:39 +01:00
committed by GitHub
parent 6a4f0befd4
commit b80d41c327
6 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+2 -16
View File
@@ -809,30 +809,16 @@ if (WinToast_FOUND)
WinToast)
endif ()
if (USE_CONAN AND TARGET CONAN_PKG::boost)
target_link_libraries(${LIBRARY_PROJECT}
PUBLIC
CONAN_PKG::boost
)
else ()
target_link_libraries(${LIBRARY_PROJECT}
target_link_libraries(${LIBRARY_PROJECT}
PUBLIC
${Boost_LIBRARIES}
)
endif ()
if (USE_CONAN AND TARGET CONAN_PKG::openssl)
target_link_libraries(${LIBRARY_PROJECT}
PUBLIC
CONAN_PKG::openssl
)
else ()
target_link_libraries(${LIBRARY_PROJECT}
target_link_libraries(${LIBRARY_PROJECT}
PUBLIC
OpenSSL::SSL
OpenSSL::Crypto
)
endif ()
target_include_directories(${LIBRARY_PROJECT} PUBLIC ${RapidJSON_INCLUDE_DIRS})