Skip to content

Commit 18ccf86

Browse files
authored
[cpp-restsdk] link cpprest without crypto libraries (#21348)
These libraries aren't needed in the generated code. Cpprest doesn't need the crypto libraries directly. It uses OpenSSL
1 parent 5997acb commit 18ccf86

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/cmake-lists.mustache

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,7 @@ target_include_directories(${PROJECT_NAME}
5959
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
6060
)
6161

62-
if (UNIX)
63-
message(STATUS "Building client library for Linux/Unix")
64-
if (BUILD_SHARED_LIBS)
65-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest)
66-
else()
67-
find_library(CRYPTO_LIB crypto REQUIRED)
68-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest ${CRYPTO_LIB})
69-
endif()
70-
else()
71-
message(STATUS "Building client library for Windows")
72-
if (BUILD_SHARED_LIBS)
73-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest)
74-
else()
75-
find_library(BCRYPT_LIB bcrypt REQUIRED)
76-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest ${BCRYPT_LIB})
77-
endif()
78-
endif()
62+
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest)
7963

8064
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
8165
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"

samples/client/petstore/cpp-restsdk/client/CMakeLists.txt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,7 @@ target_include_directories(${PROJECT_NAME}
5959
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
6060
)
6161

62-
if (UNIX)
63-
message(STATUS "Building client library for Linux/Unix")
64-
if (BUILD_SHARED_LIBS)
65-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest)
66-
else()
67-
find_library(CRYPTO_LIB crypto REQUIRED)
68-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest ${CRYPTO_LIB})
69-
endif()
70-
else()
71-
message(STATUS "Building client library for Windows")
72-
if (BUILD_SHARED_LIBS)
73-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest)
74-
else()
75-
find_library(BCRYPT_LIB bcrypt REQUIRED)
76-
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest ${BCRYPT_LIB})
77-
endif()
78-
endif()
62+
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::headers cpprestsdk::cpprest)
7963

8064
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
8165
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"

0 commit comments

Comments
 (0)