diff options
| author | OWenT <owentou@tencent.com> | 2020-07-08 04:47:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 13:47:32 -0700 |
| commit | 279a28e81d73d400e307cd8db829628c3af196da (patch) | |
| tree | de07ed2d8405b4b1cafed78f3bba85f5f7e65675 | |
| parent | 7c82b03faf93e607c722e518819a54e4359aeddc (diff) | |
| download | vcpkg-279a28e81d73d400e307cd8db829628c3af196da.tar.gz vcpkg-279a28e81d73d400e307cd8db829628c3af196da.zip | |
[libcoppp] Update version to 1.3.0 (#12264)
* Update libcoppp
Update ports/libcopp/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Update libcopp to 1.3.1
Update CONTROL of libcopp
Remove useless ```if() ... endif()``` branch
Replace ```file(COPY ...)``` with ```file(INSTALL ...)```
* Merge patch from https://github.com/microsoft/vcpkg/pull/12264
| -rw-r--r-- | ports/libcopp/CONTROL | 5 | ||||
| -rw-r--r-- | ports/libcopp/portfile.cmake | 22 | ||||
| -rw-r--r-- | ports/libcopp/usage | 5 |
3 files changed, 12 insertions, 20 deletions
diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL index ab8db193d..8c9162540 100644 --- a/ports/libcopp/CONTROL +++ b/ports/libcopp/CONTROL @@ -1,3 +1,6 @@ Source: libcopp -Version: 1.2.1 +Version: 1.3.1 +Port-Version: 1 Description: A cross-platfrom coroutine library for C++ +Maintainer: owent <admin@owent.net> +Homepage: https://libcopp.atframe.work/ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index fa5de5d38..5b6be64bb 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -1,31 +1,25 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO owt5008137/libcopp - REF 1.2.1 - SHA512 bd3525b7cafb261b395ab767d30654ee7c2920f2b8312ed7887b004e764b8dd8dece5f34a5f7724d16c4a56a281ea9eb3107eff54c947160fbf9f12b76b34485 + REF 1.3.1 + SHA512 0401f91a98b5e3961bcda45a6249fec72f03c88ae5155f4406ba8922f47ccf187f65d6f13dedb6dcd6934bb6cb742a34e84a2fd29ca9cc5b87ca19a517a64591 HEAD_REF v2 ) -# Use libcopp's own build process, skipping examples and tests vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - # PREFER_NINJA # Disabled because Ninja does not invoke masm correctly for this project ) + vcpkg_install_cmake() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/libcopp) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp) -file(COPY ${SOURCE_PATH}/BOOST_LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcopp/copyright) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/BOOST_LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libcopp/usage b/ports/libcopp/usage deleted file mode 100644 index 4593a42ad..000000000 --- a/ports/libcopp/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package libcopp provides CMake integration:
-
- find_package(Libcopp CONFIG REQUIRED)
- target_include_directories(main PRIVATE ${Libcopp_INCLUDE_DIRS})
- target_link_libraries(main PRIVATE ${Libcotask_LIBRARIES} ${Libcopp_LIBRARIES})
|