early-access version 2853
This commit is contained in:
52
externals/vcpkg/ports/curlpp/fix-cmake.patch
vendored
Executable file
52
externals/vcpkg/ports/curlpp/fix-cmake.patch
vendored
Executable file
@@ -0,0 +1,52 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8b183a0..a801ae8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -85,11 +85,12 @@ endif()
|
||||
|
||||
file(GLOB_RECURSE HeaderFileList "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
|
||||
file(GLOB_RECURSE SourceFileList "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
|
||||
+if(BUILD_SHARED_LIBS)
|
||||
add_library(${PROJECT_NAME} SHARED ${HeaderFileList} ${SourceFileList})
|
||||
target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS})
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0)
|
||||
-
|
||||
-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList})
|
||||
+else()
|
||||
+add_library(${PROJECT_NAME} STATIC ${HeaderFileList} ${SourceFileList})
|
||||
|
||||
# Make sure that on unix-platforms shared and static libraries have
|
||||
# the same root name, but different suffixes.
|
||||
@@ -97,19 +98,28 @@ add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList})
|
||||
# (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F)
|
||||
#
|
||||
# Making shared and static libraries have the same root name, but different suffixes
|
||||
-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
|
||||
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
|
||||
# Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools.
|
||||
# This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll",
|
||||
# so we add a "lib" prefix (which is default on other platforms anyway):
|
||||
-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib")
|
||||
-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS})
|
||||
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "lib")
|
||||
+target_link_libraries(${PROJECT_NAME} CURL::libcurl)
|
||||
+endif()
|
||||
+
|
||||
+target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
|
||||
# install headers
|
||||
install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp")
|
||||
install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp")
|
||||
|
||||
-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
|
||||
+install(TARGETS ${PROJECT_NAME}
|
||||
+ EXPORT ${PROJECT_NAME}-config
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
+install(EXPORT ${PROJECT_NAME}-config
|
||||
+ FILE unofficial-${PROJECT_NAME}-config.cmake
|
||||
+ NAMESPACE unofficial::${PROJECT_NAME}::
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
|
||||
+)
|
||||
9
externals/vcpkg/ports/curlpp/fix-findzliberror.patch
vendored
Executable file
9
externals/vcpkg/ports/curlpp/fix-findzliberror.patch
vendored
Executable file
@@ -0,0 +1,9 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c42943c..12d402c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,3 +1,4 @@
|
||||
+cmake_minimum_required(VERSION 2.8)
|
||||
project(curlpp)
|
||||
|
||||
|
||||
40
externals/vcpkg/ports/curlpp/portfile.cmake
vendored
Executable file
40
externals/vcpkg/ports/curlpp/portfile.cmake
vendored
Executable file
@@ -0,0 +1,40 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO jpbarrette/curlpp
|
||||
REF 8810334c830faa3b38bcd94f5b1ab695a4f05eb9
|
||||
SHA512 47eb0738d7cd2d4262c455f9472a21535343bcf08bda6de19771dab9204e068272b41782c87057d50e3781683a29e79d6387577be68d175a7fa890367f15d0d2
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-cmake.patch
|
||||
fix-findzliberror.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT} PACKAGE_NAME unofficial-${PORT})
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/bin"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/bin"
|
||||
)
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static))
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
5
externals/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake
vendored
Executable file
5
externals/vcpkg/ports/curlpp/vcpkg-cmake-wrapper.cmake
vendored
Executable file
@@ -0,0 +1,5 @@
|
||||
set(FIND_CURLPP_ARGS ${ARGS})
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(CURL)
|
||||
|
||||
_find_package(${FIND_CURLPP_ARGS})
|
||||
17
externals/vcpkg/ports/curlpp/vcpkg.json
vendored
Executable file
17
externals/vcpkg/ports/curlpp/vcpkg.json
vendored
Executable file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"name": "curlpp",
|
||||
"version-date": "2018-06-15",
|
||||
"port-version": 7,
|
||||
"description": "C++ wrapper around libcURL",
|
||||
"dependencies": [
|
||||
"curl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user