aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristina Simpson <sweet.kristas@gmail.com>2018-06-13 05:19:02 +1200
committerRobert Schumacher <roschuma@microsoft.com>2018-06-12 19:19:02 +0200
commit5c8b828e070e860af9c524fbdd96a699ffeeec05 (patch)
tree461ac175dcfa19605cbe702401af9a39e5896000
parent80f64c24dc0513b053f431059bc50634321702e7 (diff)
downloadvcpkg-5c8b828e070e860af9c524fbdd96a699ffeeec05.tar.gz
vcpkg-5c8b828e070e860af9c524fbdd96a699ffeeec05.zip
Commit a fix to gumbo on Linux so that it does include the string changes by default (#3704)
* Commit a fix to gumbo on linux so that it does include the string change macros by default. * [gumbo] Bump CONTROL file.
-rw-r--r--ports/gumbo/CMakeLists.txt6
-rw-r--r--ports/gumbo/CONTROL2
-rw-r--r--ports/gumbo/portfile.cmake3
3 files changed, 7 insertions, 4 deletions
diff --git a/ports/gumbo/CMakeLists.txt b/ports/gumbo/CMakeLists.txt
index fe239cb8a..1c90f42bc 100644
--- a/ports/gumbo/CMakeLists.txt
+++ b/ports/gumbo/CMakeLists.txt
@@ -16,8 +16,10 @@ set(gumbo_srcs
src/vector.c
)
-
-include_directories(visualc/include src)
+include_directories(src)
+if (MSVC)
+ include_directories(visualc/include)
+endif (MSVC)
add_library(gumbo ${gumbo_srcs})
diff --git a/ports/gumbo/CONTROL b/ports/gumbo/CONTROL
index ceee95b5d..82c41213e 100644
--- a/ports/gumbo/CONTROL
+++ b/ports/gumbo/CONTROL
@@ -1,3 +1,3 @@
Source: gumbo
-Version: 0.10.1-1
+Version: 0.10.1-2
Description: An HTML5 parsing library in pure C99
diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake
index a4b0ded72..a09ac8619 100644
--- a/ports/gumbo/portfile.cmake
+++ b/ports/gumbo/portfile.cmake
@@ -1,8 +1,9 @@
include(vcpkg_common_functions)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- message(WARNING "Dynamic not supported building static")
+ message(WARNING "Dynamic linking not supported -- building static instead")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/gumbo-parser