mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 19:30:15 +08:00
[xeus] remove openssl static build patch as it is no longer needed (#14387)
This commit is contained in:
parent
6a020192af
commit
34283f5d8a
@ -1,5 +1,6 @@
|
|||||||
Source: xeus
|
Source: xeus
|
||||||
Version: 0.24.1
|
Version: 0.24.1
|
||||||
|
Port-Version: 1
|
||||||
Homepage: https://github.com/jupyter-xeus/xeus
|
Homepage: https://github.com/jupyter-xeus/xeus
|
||||||
Description: C++ implementation of the Jupyter kernel protocol
|
Description: C++ implementation of the Jupyter kernel protocol
|
||||||
Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
|
Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index d02b5d6..6484131 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -244,7 +244,10 @@ macro(xeus_create_target target_name linkage output_name)
|
|
||||||
PUBLIC xtl
|
|
||||||
)
|
|
||||||
|
|
||||||
- target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
|
|
||||||
+ if (MSVC)
|
|
||||||
+ target_link_libraries(OpenSSL::Crypto INTERFACE crypt32)
|
|
||||||
+ endif ()
|
|
||||||
+ target_link_libraries(${target_name} PUBLIC OpenSSL::Crypto)
|
|
||||||
|
|
||||||
if (NOT MSVC)
|
|
||||||
if (APPLE)
|
|
@ -1,12 +1,11 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO QuantStack/xeus
|
REPO QuantStack/xeus
|
||||||
REF 424b7cd177886906a59eee535b7de59088461910 # 0.24.1
|
REF 424b7cd177886906a59eee535b7de59088461910 # 0.24.1
|
||||||
SHA512 877ca45bf649b567a9921d3e8f0adb0299dbe956978bd6e217d0c06617cf3466d08d90d607fd33e129089472e1a96ecec78b1fc21346bc13ba268168a5a6b068
|
SHA512 877ca45bf649b567a9921d3e8f0adb0299dbe956978bd6e217d0c06617cf3466d08d90d607fd33e129089472e1a96ecec78b1fc21346bc13ba268168a5a6b068
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
Fix-Compile-nlohmann-json.patch
|
Fix-Compile-nlohmann-json.patch
|
||||||
Fix-static-build.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
|
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
|
||||||
@ -28,15 +27,9 @@ vcpkg_copy_pdbs()
|
|||||||
|
|
||||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
|
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
|
||||||
|
|
||||||
file(COPY
|
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||||
${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
|
|
||||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
|
|
||||||
)
|
|
||||||
|
|
||||||
file(REMOVE_RECURSE
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
${CURRENT_PACKAGES_DIR}/debug/include
|
|
||||||
${CURRENT_PACKAGES_DIR}/debug/share
|
|
||||||
)
|
|
||||||
|
|
||||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||||
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/xeus/xeus.hpp
|
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/xeus/xeus.hpp
|
||||||
@ -47,7 +40,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Handle copyright
|
# Handle copyright
|
||||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||||
|
|
||||||
# Install usage
|
# Install usage
|
||||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||||
|
Loading…
Reference in New Issue
Block a user