diff options
| author | myd7349 <myd7349@gmail.com> | 2019-05-07 19:03:57 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-05-07 19:03:57 +0800 |
| commit | b37854348a9dab3e9121a3f08dd404fa09e0e80e (patch) | |
| tree | 4600e14b70904d014a51a8777b4197e11ed34af8 | |
| parent | 3cdfad0fb12f8e65d4f10fe49b9c6600c4c93cd3 (diff) | |
| download | vcpkg-b37854348a9dab3e9121a3f08dd404fa09e0e80e.tar.gz vcpkg-b37854348a9dab3e9121a3f08dd404fa09e0e80e.zip | |
[septag-sx] Update to 2019-05-07
| -rw-r--r-- | ports/septag-sx/CONTROL | 4 | ||||
| -rw-r--r-- | ports/septag-sx/portfile.cmake | 12 | ||||
| -rw-r--r-- | ports/septag-sx/win32-sharedlib.patch | 14 |
3 files changed, 7 insertions, 23 deletions
diff --git a/ports/septag-sx/CONTROL b/ports/septag-sx/CONTROL index 4d641071d..4c329f1a6 100644 --- a/ports/septag-sx/CONTROL +++ b/ports/septag-sx/CONTROL @@ -1,3 +1,3 @@ -Source: sx -Version: 2019-04-27 +Source: septag-sx +Version: 2019-05-07 Description: Portable base library for C programmers, designed for performance and simplicity. diff --git a/ports/septag-sx/portfile.cmake b/ports/septag-sx/portfile.cmake index cb3eca760..0c2e85fa4 100644 --- a/ports/septag-sx/portfile.cmake +++ b/ports/septag-sx/portfile.cmake @@ -3,11 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO septag/sx - REF 161d7d77a3bdcc8a55846e2dd1791773888fce24 - SHA512 198476793c921d8859f5f5b9ffe8915a7bc4b1d9d518e6772b3d90ccd03a7f5debe5bde32d7d5164f64a0beda53c5dcd06849814e7df447bccb93aa13bbca8b0 + REF b70567a52636f9ecfdb904c586a957a806efc990 + SHA512 8945476b428418d3c7845afd831503f43fd44672a9b3506576c5baf50f55739327275a8be97a323f3ae146f84b76bbe266ac7b5df1b85cb05a826ed5e30b9547 HEAD_REF master - PATCHES - win32-sharedlib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SX_SHARED_LIB) @@ -23,9 +21,9 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sx TARGET_PATH share/sx) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/sx/config.h "define SX_CONFIG_SHARED_LIB 0" "define SX_CONFIG_SHARED_LIB 1" @@ -38,4 +36,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) # CMake integration test -vcpkg_test_cmake(PACKAGE_NAME ${PORT}) +vcpkg_test_cmake(PACKAGE_NAME sx) diff --git a/ports/septag-sx/win32-sharedlib.patch b/ports/septag-sx/win32-sharedlib.patch deleted file mode 100644 index 41b39ec3d..000000000 --- a/ports/septag-sx/win32-sharedlib.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 840692e..8a4eb9e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -226,7 +226,8 @@ install( - TARGETS sx - EXPORT sx-config - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - install( - EXPORT sx-config |