From 90019d39df98bd0e0699ae06b2a749f30bcb6de7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 23 Mar 2017 21:59:41 -0700 Subject: [glog] Enable static builds. Switch to Ninja for better management of parallelism. --- ports/glog/CONTROL | 2 +- ports/glog/portfile.cmake | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL index bf69d98c3..5cf97bd11 100644 --- a/ports/glog/CONTROL +++ b/ports/glog/CONTROL @@ -1,4 +1,4 @@ Source: glog -Version: 0.3.4-0472b91 +Version: 0.3.4-0472b91-1 Description: C++ implementation of the Google logging module Build-Depends: gflags diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 4895be694..ec71e99d3 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -6,10 +6,6 @@ # CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} # -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(STATUS "Warning: Static building not supported yet. Building dynamic.") - set(VCPKG_LIBRARY_LINKAGE dynamic) -endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glog-0472b91c5defdf90cff7292e3bf7bd86770a9a0a) vcpkg_download_distfile(ARCHIVE @@ -21,6 +17,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 -- cgit v1.2.3