Skip to content

Commit fb4f6fa

Browse files
committed
cmake : fix cmake --install
Signed-off-by: Adrien Gallouët <[email protected]>
1 parent 357d7bb commit fb4f6fa

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

vendor/cpp-httplib/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ if (LLAMA_BUILD_BORINGSSL)
3636
boringssl
3737
GIT_REPOSITORY ${BORINGSSL_GIT}
3838
GIT_TAG ${BORINGSSL_VERSION}
39+
PATCH_COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_SOURCE_DIR}/patch-boringssl.cmake"
3940
)
4041

4142
set(SAVED_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
@@ -49,12 +50,6 @@ if (LLAMA_BUILD_BORINGSSL)
4950
set(BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS})
5051
set(BUILD_TESTING ${SAVED_BUILD_TESTING})
5152

52-
# skip bssl
53-
if(TARGET bssl)
54-
set_target_properties(bssl PROPERTIES EXCLUDE_FROM_ALL TRUE)
55-
set_target_properties(bssl PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
56-
endif()
57-
5853
set(CPPHTTPLIB_OPENSSL_SUPPORT TRUE)
5954
target_link_libraries(${TARGET} PUBLIC ssl crypto)
6055

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Remove bssl
2+
file(READ "CMakeLists.txt" content)
3+
string(REPLACE "add_executable(bssl" "#add_executable(bssl" content "${content}")
4+
string(REPLACE "target_link_libraries(bssl" "#target_link_libraries(bssl" content "${content}")
5+
string(REPLACE "install(TARGETS bssl" "#install(TARGETS bssl" content "${content}")
6+
file(WRITE "CMakeLists.txt" "${content}")

0 commit comments

Comments
 (0)