diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2017-12-20 13:24:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 13:24:59 -0600 |
| commit | f1f373b189453f33a944e9db8b3451b1c785e223 (patch) | |
| tree | 8713b7dc28734e4d4ad0ebba76459850955ce004 /ports/string-theory | |
| parent | 6363688b6d2f3522a4ce48cedb60da31775cd923 (diff) | |
| parent | 6cb6a61aaf5ef2c143f974e9f731778bcd3f5cbe (diff) | |
| download | vcpkg-f1f373b189453f33a944e9db8b3451b1c785e223.tar.gz vcpkg-f1f373b189453f33a944e9db8b3451b1c785e223.zip | |
Merge branch 'master' into fftw
Diffstat (limited to 'ports/string-theory')
| -rw-r--r-- | ports/string-theory/CONTROL | 2 | ||||
| -rw-r--r-- | ports/string-theory/disableTests.patch | 13 | ||||
| -rw-r--r-- | ports/string-theory/portfile.cmake | 10 |
3 files changed, 4 insertions, 21 deletions
diff --git a/ports/string-theory/CONTROL b/ports/string-theory/CONTROL index 26cf23674..04384f8fb 100644 --- a/ports/string-theory/CONTROL +++ b/ports/string-theory/CONTROL @@ -1,3 +1,3 @@ Source: string-theory -Version: 1.6-1 +Version: 1.7 Description: Flexible C++11 string library with type-safe formatting. diff --git a/ports/string-theory/disableTests.patch b/ports/string-theory/disableTests.patch deleted file mode 100644 index 7990385ac..000000000 --- a/ports/string-theory/disableTests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf79105..a29c209 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -230,5 +230,6 @@ install(FILES - install(EXPORT string_theory-targets - DESTINATION "${ST_INSTALL_CMAKE_DIR}/string_theory" COMPONENT devel) - --enable_testing() --add_subdirectory(test) -+# Note:we do not mind the tests, which caused our library build failed ,so disable the tests -+#enable_testing() -+#add_subdirectory(test) diff --git a/ports/string-theory/portfile.cmake b/ports/string-theory/portfile.cmake index e3508b76a..c986839e1 100644 --- a/ports/string-theory/portfile.cmake +++ b/ports/string-theory/portfile.cmake @@ -3,15 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zrax/string_theory - REF 1.6 - SHA512 5bc99b6dfc2ab43d2812ee47dfbbeeb68106da39b2349799ab924f009270166ebb5508f87a37e634fbfa5495dd263697a582404650eedc5393722761c5ce2028 + REF 1.7 + SHA512 59b367542a0dde727bf58791a94eed1b0f7007d1c661a8e728f3668bb284cadd98a03379cb96dc832e5230b6e991b66b9c8522e3525ed168505d9b930af5d239 HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/disableTests.patch -) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(ST_BUILD_STATIC ON) else() |