Merge remote-tracking branch 'origin/5.2.x' into 6.0.x

This commit is contained in:
William Cheng
2021-04-28 18:08:24 +08:00
2343 changed files with 79888 additions and 22027 deletions

View File

@@ -39,7 +39,6 @@ else()
find_package(cpprestsdk REQUIRED)
find_package(Boost REQUIRED)
find_package(pthreads REQUIRED)
endif()
# Manually set the cpprestsdk paths when not using package manager
@@ -68,9 +67,9 @@ target_link_directories(
)
if (UNIX)
target_link_libraries(${PROJECT_NAME} PRIVATE cpprest pthread ${Boost_LIBRARIES} crypto)
target_link_libraries(${PROJECT_NAME} PRIVATE cpprest ${Boost_LIBRARIES} crypto)
else()
target_link_libraries(${PROJECT_NAME} PRIVATE cpprestsdk::cpprest ${pthreads_LIBRARIES} ${Boost_LIBRARIES} bcrypt)
target_link_libraries(${PROJECT_NAME} PRIVATE cpprestsdk::cpprest ${Boost_LIBRARIES} bcrypt)
endif()
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)