Merge pull request #2401 from zrax/string-theory

Update string-theory to 1.7
This commit is contained in:
Alexander Karatarakis 2017-12-18 17:42:11 -08:00 committed by GitHub
commit 0f0d1051d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 21 deletions

View File

@ -1,3 +1,3 @@
Source: string-theory
Version: 1.6-1
Version: 1.7
Description: Flexible C++11 string library with type-safe formatting.

View File

@ -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)

View File

@ -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()