From fda988964d2f84aae705802092315ba83ada76a7 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Sun, 26 Nov 2017 07:29:56 +0900 Subject: [PATCH] Enable Ninja build in QHull port Enable Ninja build in QHull port. --- ports/qhull/portfile.cmake | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake index 493a14e385..ab4ea3b92b 100644 --- a/ports/qhull/portfile.cmake +++ b/ports/qhull/portfile.cmake @@ -1,15 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) vcpkg_from_github( @@ -22,7 +10,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - #PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS -DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include -DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull @@ -53,6 +41,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_rd.lib) endif() -# Handle copyright file(COPY ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/qhull) file(RENAME ${CURRENT_PACKAGES_DIR}/share/qhull/README.txt ${CURRENT_PACKAGES_DIR}/share/qhull/copyright)